diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-12 20:08:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-12 20:08:39 +0000 |
| commit | 894dd710b124279d5cb86d7f4b5750264398f1a1 (patch) | |
| tree | edc24b665db7cf5c40140c352fa6f44e86fe3d0d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b47fa455e8bdee00f248af7e65291d5f0904003f (diff) | |
| parent | 110beb4484f18f1461edb786e188b1e38bba4733 (diff) | |
Merge "Merge \\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e am: cbe258aa27 -s ours am: 5b28589127 am: dbd5480ac4" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions