diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 17:03:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 17:03:10 +0000 |
| commit | 3e0307160c04995a2339a5834059e7b14a9a7586 (patch) | |
| tree | a0cf4b17e8239f3c3298df1e19bca5e6a723c968 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 58710e9a15fa2d6a67e0e0fc8b18d779edb5f5cd (diff) | |
| parent | 1941a166716bc5e38fcc746b525096f85303b2e4 (diff) | |
[automerger skipped] Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 am: 1941a16671 -s ours
am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 8b15af2a92 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640622
Change-Id: I09e8f46dca7f65c032c9852300db3d3c96f4a335
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions