diff options
| author | Mark Chien <markchien@google.com> | 2020-07-01 10:11:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 10:11:30 +0000 |
| commit | c20caa573b9b4e0171735ae43c5578a207cab4c8 (patch) | |
| tree | edb8abc40ecbf8967360ef361d5a8b85ecd7bd2e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 943b22a1a5f3c798d1c68c276115e9a579fc3a12 (diff) | |
| parent | 010a53c4087c2106c2622a753774d018049cd204 (diff) | |
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -s ours am: 010a53c408 -s ours
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a00d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I746c6a4282f3ff0d32bf6db654bc3b75cfb14669
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions