| commit | d62d32bf8b12c92595aa8769833b9a13ef43d2b8 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Wed Apr 18 15:44:48 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 18 15:44:48 2018 -0700 |
| tree | f7adb965e0e9841b67a90df8a3f2169e5ebe9745 | |
| parent | 0f8e1751acf35944611e79a778a12c63d19528a7 [diff] | |
| parent | 10a7da19d785518fffcfa0a42fc7053b9510e902 [diff] |
[automerger skipped] Merge changes from topic "nnapi-aosp-sync" am: 07c5cfcf34 am: ebce657784 -s ours am: 10a7da19d7 -s ours Change-Id: I20f46d3a718ecdb74c3e77a31a7c79aa552c255e