| commit | 174b331d4b3af92e44b4f88650117de3604bcba6 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Tue Mar 06 01:25:32 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 06 01:25:32 2018 +0000 |
| tree | a056a90bd478067d5454edd76847099df0696faf | |
| parent | b9d85fe88cfcc10ea17e2b1a083e8a0957cdaf0c [diff] | |
| parent | 6db53bc1cfba9758e0760f8daf7939c8eb881442 [diff] |
Merge changes from topic "cp_nnapi" am: 7df64ea2fd am: 6db53bc1cf -s ours Change-Id: Idad9062b841d0636c3bfcb928adc196043bb2421