diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-22 00:08:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 00:08:05 +0000 |
commit | 8186da583ae12ac37c52ae891ba53c3ad440a7fc (patch) | |
tree | f35db4dcf0cbb18666742a68f268dd8871da24e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 18ef48d54d4163487429fc99635eae09067d29af (diff) | |
parent | 45c9f542e7b80ba8d28934b3d78240738a3a5ac2 (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
Change-Id: I790a462b852be295fed36a8c6b80a9d37391b28e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions