diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-20 05:00:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 05:00:44 +0000 |
| commit | 1950d8311eeee5e9ac5a524bb7ab5a59e46b104b (patch) | |
| tree | f122f630ee0b7dbdd2dcf3b3ca16e3891a7346a2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5f3867e833bfee815e2235b2dee338ebf2127f6e (diff) | |
| parent | 8a72818f653a08e6859119c604d48884b5060ec5 (diff) | |
[automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours am: 8a72818f65 -s ours
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc20 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954
Change-Id: Ibb6e437300cba97e85a4d4f6f4574c1018d8c4f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions