diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-06 05:20:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 05:20:45 +0000 |
| commit | 561fd184e50424d900c0e89d23e7841319ba0053 (patch) | |
| tree | 8a37b02fdee9cb5aad6fcacc862d881ff589a519 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2abe3df94da9ac0dd111bdf2eb9e3884e5537aa4 (diff) | |
| parent | ec522fffcd1556d8148e5b040b63c075dcca2316 (diff) | |
[automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: ec522fffcd -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651
Change-Id: I2a8839438267eb0b1fea679b529f9568991a94d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions