diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-08 23:07:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-08 23:07:40 +0000 |
| commit | 4cc4892b290b3a82cf8c4c6a5fd8accfd2ea01a5 (patch) | |
| tree | 738e248cac8de845eeaa2eed27fbd7a224855747 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 46d6bdda489f0537903cbfbdc262b347ab0bd354 (diff) | |
| parent | b351365a440b065a431ae75162872f00e1e90639 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: d943c45349 am: 2b5630f86c -s ours am: b351365a44 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700314
Change-Id: I7e6d75cfaf22f5addfeb41afdc9d943646a5be3b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions