diff options
| author | Bill Yi <byi@google.com> | 2021-04-14 06:31:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 06:31:20 +0000 |
| commit | d4aa3fc3106862d4a41a9f24dce7c5de403ddcdb (patch) | |
| tree | 678343a3d3d8c78cf97b17d389b55ac83aed97cf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 85f4d04ef2679d35e48117d5cf8d18a6a44bd3f7 (diff) | |
| parent | b67a5b50fa5ac3dc60d1114ccbce00462b4aabba (diff) | |
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions