diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 16:29:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 16:29:48 +0000 |
| commit | b83e69542d87eec7c9ffbbde7d55a421fd3b3ece (patch) | |
| tree | ac270e852c467a3ea1c552799605b0e6d25f0a4d /light/aidl/default/main.cpp | |
| parent | e3bc6df86f1bb11da2972663c1921ba47fe7c523 (diff) | |
| parent | e7c83782cacb03a5343ee11916f709b3740e6fbc (diff) | |
[automerger skipped] Merge changes from topics "aosp-nnapi-1.3-operations", "aosp-nnapi-async-cmdqueue" am: 1b4b30d064 am: 518b2d8fef am: e7c83782ca -s ours
am skip reason: Change-Id Idc3f815040efccbbfa95b70d5d437441d0bd8682 with SHA-1 33173a3e68 is in history
Change-Id: Ic6acdb91990d741e9a354cf9ad6c7c6cc249275b
Diffstat (limited to 'light/aidl/default/main.cpp')
0 files changed, 0 insertions, 0 deletions