summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-21 23:33:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-21 23:33:33 +0000
commitc2ca4066838bbbcde4e065134c58f58a89511537 (patch)
tree4f2afee494520b322c9248650e3cb55b9fd3b95e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5bf93280bf6aba5b9c4edcb32fee7db720fbd360 (diff)
parent00e79982aa743579d34f988f0f09aec19fde6ee4 (diff)
Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe am: 95c9bef53b -s ours
am: 00e79982aa Change-Id: I190e3d96763d241bbff2346e4c21f368e5906103
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions