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