summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-22 01:09:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 01:09:27 +0000
commitc3443ed3ded30a2a59be9e147d4f88099750fde4 (patch)
treecd87ffb082261147d6b1b7899167d1c78ca870c6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd2c4b299419886068af9a84054d5586862500324 (diff)
parent8186da583ae12ac37c52ae891ba53c3ad440a7fc (diff)
Merge \\\\\\\"Add pm operation to set user restrictions.\\\\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35 am: 4e8aa0f35f -s ours am: b0de5fd328 am: 45c9f542e7
am: 8186da583a Change-Id: I4dcd8350b78d01a16ea7d479a1a2afff9cac3eec
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions