diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 23:56:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 23:56:46 +0000 |
commit | 45c9f542e7b80ba8d28934b3d78240738a3a5ac2 (patch) | |
tree | 502626a427587f6985972438fc1119d836a20230 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 25d2682bef9a1a9405cb00902e674eefd1bb8b7f (diff) | |
parent | b0de5fd328b04ba89b09915dd367014d6536dc02 (diff) |
Merge \\\\\"Add pm operation to set user restrictions.\\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35 am: 4e8aa0f35f -s ours
am: b0de5fd328
Change-Id: Ie38e12d88c78c85fc71dd7e06e3cb3dd833518c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions