diff options
| author | Bill Yi <byi@google.com> | 2021-04-14 07:16:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 07:16:31 +0000 |
| commit | 9b4ec0cd60ef31c3df8ebf2c5cd48bc98f183d63 (patch) | |
| tree | 37a393279a7786a650cd404e8c5c5647a26aa184 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f3779061f48c4cff0330042c53813a613f8871ee (diff) | |
| parent | d4aa3fc3106862d4a41a9f24dce7c5de403ddcdb (diff) | |
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours am: d4aa3fc310 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: Ie382825bbc4a1b0cda64fe7a118dd6066b2cae7c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions