summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJonathan Basseri <misterikkit@google.com>2017-10-20 03:51:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-20 03:51:33 +0000
commitb56a1653013cece13114742859e8c1edfb8ef053 (patch)
tree4258d64c2b9fbe02fcd30f9127343ee8dc7e6597 /tools/aapt2/java/JavaClassGenerator.cpp
parent5e9e79ccec447b70bd9806316aafbb3d2d1bebdf (diff)
parentcb9dc98cb886e252b323418a3bcbb82e358917e7 (diff)
Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev am: 7bd96d32a1
am: cb9dc98cb8 -s ours Change-Id: I7af86235fb7830d4084a8e9e169977c6776fec00
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions