diff options
| author | Xin Li <delphij@google.com> | 2020-09-02 23:36:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 23:36:34 +0000 |
| commit | 455e36efe2fce8969c76d68c37445ff3ac7baa84 (patch) | |
| tree | 6fee3fe821504564c1ce21e63aeaa4b25b2e6c78 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8323c72f0145c5542ce7310d5ed27ab2c85d45bf (diff) | |
| parent | ed22f488404030d2d059dede8d4b7bddee3aa6e1 (diff) | |
[automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8be -s ours am: ed22f48840 -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: Ic485b269579ca470e4b74ee434f1b35110a0ab75
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions