diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:31:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:31:11 +0000 |
commit | 47da8a0bdc9b401ae103a629761844ffd177960a (patch) | |
tree | c994a85d2a2cdd31e844d57b6e95e7e4a2395d26 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 0d457d125458d76e8821dad1d72ed822a1909b34 (diff) | |
parent | a9b937b29d8e90f89ed3b3d99c8c3f8fa4c3f735 (diff) |
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41
am: a9b937b29d
Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions