summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2019-12-07 14:12:22 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-07 14:12:22 -0800
commit2ee5f0ae287d5a4b4e23b61ba48e5f747dac2b56 (patch)
treef9426595e8c87bb972668a55c7c501c3ac1015dc /tools/aapt2/java/JavaClassGenerator.cpp
parent679025e6a9a79af5a6c001d3b94ab9d383594c0a (diff)
parentc2769be12604ee75c144d92c2a8e6fbf7a5e614a (diff)
[automerger skipped] Merge "allow com.android.cellbroadcastservice grant signature permission" am: a8c4669579 am: 15878e511f
am: c2769be126 -s ours am skip reason: change_id Id31e3ce6662db254b77178bc2d6ee9ec7532bc8d with SHA1 3da1104af0 is in history Change-Id: Id4106088073a8956b445242c3b997560d5354be7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions