summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-21 02:38:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-21 02:38:56 +0000
commit3e238e33968af25df7d1028725b51cca2995c095 (patch)
tree8e774cf9bef17261b8d31ef9b3cae72e2e30cf96 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent93a622150f4ae413ade0528a539f0586707c6e7b (diff)
parentc147db7a79aac7af51b4fda3fcd8735c47306eb3 (diff)
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50
am: c147db7a79 Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions