diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-03 18:41:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 18:41:31 +0000 |
| commit | d7737897f42d70eb141b72972c0577b4a5c55b6a (patch) | |
| tree | 312ef532d3cf07a22f1a0101227e27e45ed40dd3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8e86213b028b7e902906bf2012097b113153e5cc (diff) | |
| parent | 9ef690314113fc1a779546e22116770b934a1cac (diff) | |
[automerger skipped] Merge changes from topic "limited_use_keys" am: 892c82e0f2 am: 0e30e1e432 am: 9ef6903141 -s ours
am skip reason: Change-Id I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef with SHA-1 fcb4e8ee2d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cd24986102cacc1b22704b0ca4d1b60de5b98f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions