diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:36:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:36:46 +0000 |
commit | e01775f0be3222ab5bdcded33d22a624d23578fb (patch) | |
tree | ce98662c7347bf0c6526ace4e8aac5e65e189b7a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 199f6a490a9ae01cbd428302e38c2905b6907606 (diff) | |
parent | 47da8a0bdc9b401ae103a629761844ffd177960a (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
Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions