summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2021-04-14 05:46:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-14 05:46:16 +0000
commitb67a5b50fa5ac3dc60d1114ccbce00462b4aabba (patch)
tree3cf983f29d27b017cce9c842436b6f7e7cd5ccf6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbf7c109ed6b9bf0ccf0a3021cc47290166614735 (diff)
parent8e90abbe3975f36130ea01092bb8e2b30aa0ccc0 (diff)
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -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: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions