diff options
author | Louis Chang <louischang@google.com> | 2021-01-18 16:47:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-18 16:47:47 +0000 |
commit | bfcc7e5f4f0a18471f5493c4dcae9d54347474f0 (patch) | |
tree | 9c8338e28316a574717077485aa11ef317f475b4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7ad1ba1f28cce33f01530e3c36c4de8443462aeb (diff) | |
parent | 99376807648ab2fa75ad517448dc9ccbaf10b091 (diff) |
Merge "Revert "Integrate IKeystoreAuthorization aidl's addAuthToken wit..."" am: 5896e8c4fd am: ec5b2c95cd am: 9937680764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553467
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie0cdc4f92c34085bd4faad4fce9807dbedaa7bfa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions