summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-21 00:04:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-21 00:04:35 +0000
commit4f77ca16e4ea9c319d713d1e765247983885a4f7 (patch)
tree7d9302399e4862527684a99ae9a2f39779394b74 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcb970f408ebda0435fc513afd52dddf0b6acdec4 (diff)
parent3d995d6f5fe9fd0c6cc74e75e618b9cdf8096dfb (diff)
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660
am: 3d995d6f5f -s ours Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions