diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-22 01:11:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 01:11:52 +0000 |
| commit | 6b70c2670e9ff4f4a81d5351a372380168c93c47 (patch) | |
| tree | cd87ffb082261147d6b1b7899167d1c78ca870c6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 20512991d0e26414f733ddd8250e028fe60a8ac6 (diff) | |
| parent | d7affea299d4dc5e200033b53f45dc048fdab242 (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 am: e01775f0be am: 5e41f90a92 am: 80e720742b am: 565d13f17e -s ours am: e4e424d80d am: 44f24379cf
am: d7affea299 -s ours
Change-Id: I9e74c21f252ea5a4959ce4b1cbeb77e91a734a2a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions