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-02-05 23:41:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 23:41:32 +0000
commit82f3668df5df0772cc294224ca50dc2091ce828e (patch)
tree17fbb169d3fcc8565990ad349df2c98e8c7f9d9f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc9076a7e8dc0bda09070d64326bb98ce90886b95 (diff)
parent53ae130d31a485682d8babdf0dbf9ab261732d66 (diff)
Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31
Change-Id: I3f24b00947dbdba84c0b1a1f1c6828ea0f7a22f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions