summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2021-02-05 03:38:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 03:38:22 +0000
commit4e452808c09ebd00e184980d6fd2f01a854cc177 (patch)
treebce5e2ac8520c6bd145e3a35e561b4b894aa5379 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentca389a64274496c4f3a77d99b845af320fbb42d5 (diff)
parent707d05ce9382e6193fa1763167b646601b6cc023 (diff)
[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp am: 707d05ce93 -s ours
am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 b321fb5fc8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482453 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6472ac6f2dd11a15fc9c440552e2293901f0ec6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions