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-28 00:41:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-28 00:41:44 +0000
commit61852494444e895de5d10b3d6f2e8cbcc990fd50 (patch)
tree96b5f685aed29f73255235cf1eb1cb794611a386 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent866650f96d2a888cc2693996a0262993f3b2396b (diff)
parentcc9c5b32976c1bd6d19d66315be10aeaaa086499 (diff)
[automerger skipped] Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline" am: 419caebfc9 am: bee019ac53 am: cc9c5b3297 -s ours
am skip reason: Change-Id I0a5ca7699c969585ea08c82ea7cafd26a73c08f9 with SHA-1 24fded67fb is in history Change-Id: Ia28d29389cd62836dfef8a6f3dd1ce5880427c2f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions