summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2019-12-05 00:31:42 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-05 00:31:42 -0800
commit530e5f3d5aa56fadea97f1fbe26948273d8554ca (patch)
treefdb1efff1eca5d714d4f166b5e722c8b755f0c17 /tools/aapt2/java/JavaClassGenerator.cpp
parentb64eb29b1875b3f40ec2fb0172c8498fdcb09c6e (diff)
parent5202828d3c2a8a3db8c5155b5e154db36c0503c7 (diff)
[automerger skipped] Merge "Move TelephonyPermissions to TelephonyCommon" am: c5f12f75e6 am: b00ee2e7fe
am: 5202828d3c -s ours am skip reason: change_id I3681043a197e6daeb16dcf506d672bdcf1fc8da8 with SHA1 fde53bb6f1 is in history Change-Id: Ica862cdc26714810d24f45a1cbe8ce2ec92fc21a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions