summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 23:53:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 23:53:05 +0000
commit3452551dd1decfe53a3678457e52fbaad5a02758 (patch)
tree8c5ebf116807a406242f29f4781b292aef5d2ce0 /tools/aapt2/java/JavaClassGenerator.cpp
parent1089f083be6031b4e2e75fd861f2921461fa6351 (diff)
parent82f3668df5df0772cc294224ca50dc2091ce828e (diff)
Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31 am: 82f3668df5
Change-Id: I4d8626c985f9021e03d4c2c0ef1adb18c142ca05
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions