summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-01-24 23:38:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-24 23:38:15 +0000
commitf88fdc995fbd23ecc3e9b6b8a94186cd96969085 (patch)
treee2b5a83f2701066f03cddd760a5d9a5a5c456030 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente9d3cc5ad8f55c266ed1ef85fd41da62f4797ecb (diff)
parent047707c7aa45368b1114dd7ac7127ed02b5b263c (diff)
Merge "Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d am: 07b212b788"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions