diff options
author | Xin Li <delphij@google.com> | 2020-09-02 23:16:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 23:16:43 +0000 |
commit | ed22f488404030d2d059dede8d4b7bddee3aa6e1 (patch) | |
tree | 02420875ac4d5c0a78d097d35650ef60908babfc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6078830f46d19d82d4806a9fbcff74240e6520f1 (diff) | |
parent | c8c8e8e8bed4213a7e77ca61fd71adbb17054459 (diff) |
[automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8be -s ours
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348
Change-Id: I735e135e519708d0e1ab07504944ad1dcdfcccbc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions