diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:20:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:20:38 +0000 |
commit | 76c9d707568e10d1d6560abed4511692db07b98f (patch) | |
tree | 5d753615debb50493a90fab635a26935a10c70e2 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | fd0757f195657012c2b22fc295df428f32fbc806 (diff) | |
parent | cb7e0643c9e8cb990947300560e8c0c83ad6b5b4 (diff) |
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf
am: cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions