diff options
| author | Bill Yi <byi@google.com> | 2021-02-04 18:40:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 18:40:33 +0000 |
| commit | 958a70d3af698d39f627438d7eed0e6e998d7d46 (patch) | |
| tree | ef2f2d501abda83198d556bf53a200c25c2cd25a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | af14107e13bb4f131f1474d6efc69857cef813af (diff) | |
| parent | ed379ba11fb86e621c5ccac56eda01dcaf14ad83 (diff) | |
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: e412ab4ec6 -s ours am: ed379ba11f -s ours
am skip reason: Change-Id Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d with SHA-1 ce1b075b2b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6fafdadf12afda55b4e8e188875f96ee5194a1fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions