diff options
author | Mark Chien <markchien@google.com> | 2020-07-01 09:59:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 09:59:28 +0000 |
commit | 010a53c4087c2106c2622a753774d018049cd204 (patch) | |
tree | c242ae567c2aaa2f70ce8fe1c54497e33a4157f4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c1017f07e9641d47092ef3136a75a57458f32149 (diff) | |
parent | f089dd736e9847e0df6559bbde06003e1873795d (diff) |
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -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: I8940d70a097ca954ceec622ba42663a7fbf11c9c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions