tree 896592addae0643c7637558b1eaa36504c21c23c
parent f650c5287661b7a6f0228eb96bc061975641dc1c
parent bd0e762d1133aeb7c0fc2621af22cb830e1cedcb
author Treehugger Robot <treehugger-gerrit@google.com> 1612839608 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612839608 +0000

[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: 5968a3906e am: 8add53a34a am: bd0e762d11 -s ours

am skip reason: Change-Id I99a5000109b171a74ac4f604b88e86a87b48ec5f with SHA-1 969b9219b9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a388163b2a82ed4c669680f12827b579029658d