diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 23:47:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 23:47:38 +0000 |
commit | 00f88ff8f31b4d747ea955d88bb5e541206c9066 (patch) | |
tree | 8327b5c24d6b2d0132fc2851c0437062c7a1d216 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | baebdf1e6c53764892eb6c26835d6d69e4b34ea4 (diff) | |
parent | 5bf93280bf6aba5b9c4edcb32fee7db720fbd360 (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: 5bf93280bf
Change-Id: Ifff24ce3bbf2170a5ffc20ce7192624c0caa56e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions