diff options
author | Nate Myren <ntmyren@google.com> | 2020-11-20 16:19:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-20 16:19:00 +0000 |
commit | aa857a440d9cb99596f54902a58cb8c00de4c897 (patch) | |
tree | 7b26a637ece1c0bf7e28df98bb5ec73e7fb93b06 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0cac1e44c10ee53004aed1586fe5b09766d93f79 (diff) | |
parent | 5a953a9da4f0af4158cf07d2cff7bd78fcea288c (diff) |
[automerger skipped] Merge "Allow self blames to be trusted" into rvc-qpr-dev am: 35c4f102e4 am: 5a953a9da4 -s ours
am skip reason: Change-Id I6f413dd6430f096590dadf87dad32264523b13c3 with SHA-1 4d4d8e2f9f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13091913
Change-Id: I75f77df2848dcc60dbf0024cb9c36129d330a4c2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions