summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-21 22:42:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-21 22:42:25 +0000
commit5e41f90a927dd9b5ed454130a2b9d8f779a058d5 (patch)
tree83659b87325f5bef8d2df794e17c91b17849c382 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent06c3f60136b8ab5a4359fda53b0f675adc64a392 (diff)
parente01775f0be3222ab5bdcded33d22a624d23578fb (diff)
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours
am: e01775f0be Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions