| commit | 025290aa151257dfc5f32f51bc74cb0985a75769 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Tue Apr 13 18:50:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 18:50:35 2021 +0000 |
| tree | 7245fa1a9b6c5d98c6e1b6e68f74995794a35694 | |
| parent | ec6dbff8753036a8237305d6dcc443350e3c84bd [diff] | |
| parent | 099b2a573df9f14d530ad87fdc7bc40b6a0b0d71 [diff] |
[automerger skipped] Merge changes from topic "nnapi-aidl-memory" am: 6594b5f1b4 am: d6a1875bd0 am: 099b2a573d -s ours am skip reason: skip tag Change-Id Ief565473b4d82e0bb43785fc3b8275b16bd26cf6 with SHA-1 bed23d9c33 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666282 Change-Id: I6fc85a329134106034193653249f505ac3411d74