author | Michael Butler <butlermichael@google.com> | |
Wed, 18 Apr 2018 22:24:39 +0000 (15:24 -0700) | ||
committer | android-build-merger <android-build-merger@google.com> | |
Wed, 18 Apr 2018 22:24:39 +0000 (15:24 -0700) | ||
commit | 10a7da19d785518fffcfa0a42fc7053b9510e902 | |
tree | e95a6d1e0739b3e9c4d3acb4feb9243ccfa6f82a | tree | snapshot (tar.xz tar.gz zip) |
parent | ed1f68d2e433ec509368bafb27939fab10c9fb21 | commit | diff |
parent | ebce65778404b1ac823ae3b076f7a2f124aac5b5 | commit | diff |
[automerger skipped] Merge changes from topic "nnapi-aosp-sync" am: 07c5cfcf34
am: ebce657784 -s ours
Change-Id: I1c8f0f3b754f5d8c3322ffd88c3f9052e1e67eee
am: ebce657784 -s ours
Change-Id: I1c8f0f3b754f5d8c3322ffd88c3f9052e1e67eee