diff options
| author | Xin Li <delphij@google.com> | 2021-05-08 23:07:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-08 23:07:26 +0000 |
| commit | 46d6bdda489f0537903cbfbdc262b347ab0bd354 (patch) | |
| tree | 738e248cac8de845eeaa2eed27fbd7a224855747 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6f7a5b8eb03f7314a63fa7965511109ab2b5c5f1 (diff) | |
| parent | b5eb7582ad9aaaadbf15ba67be188da261c1601f (diff) | |
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4ba43d5b0b am: 8fdc05d89c -s ours am: b5eb7582ad -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700314
Change-Id: Ic1516bf6842dbe30750adb720ce82ef69cf9bd24
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions