summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-08 23:48:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-08 23:48:38 +0000
commitdc2a2bd19e17bf07fd21f3f164114ceb1cfa59fd (patch)
tree9a3e71a44ca875a86389a6053ba3888de860d0d0 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent165941bd0b18c21a9624e2af01d507ad533279cc (diff)
parentd9f8e96ceabced47e2efb38a54418864431007fb (diff)
[automerger skipped] Merge "[Mainline] Make canManageSubscription(SubscriptionInfo, String) System API." am: 5b879d5b2c am: 4e07be1fd7 am: d9f8e96cea -s ours
am skip reason: Change-Id I824582f9203b950d1153091181de345629adfe65 with SHA-1 35b249226b is in history Change-Id: I398722a68ab8ea2de99884890efaace52ca34baa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions