diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-28 01:31:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 01:31:39 +0000 |
| commit | a9f72d30748054e90deb9b8531433c15729c5209 (patch) | |
| tree | 0aafed8680352921bd53804d29c759d55426331f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e5e92aee86ba9b1e3db5e5a08bdd9c3c90e841c9 (diff) | |
| parent | 0506e4eb20e89116d7f8065d9d4376aaec92b89e (diff) | |
[automerger skipped] Merge "Specify UID in getAuthenticatorIds" am: 47f27e64c0 am: f6bbf126d3 am: 0506e4eb20 -s ours
am skip reason: Merged-In I0eef28ecefb85f1c10a73a354d08c38087d59814 with SHA-1 91bb4412f7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687049
Change-Id: I3e64c03c2f5f3c6d09342fa423225ef19dc2c4bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions