diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 23:47:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 23:47:41 +0000 |
| commit | 122329cb65000e61a5c5d90145a7b3177fe06b21 (patch) | |
| tree | 8327b5c24d6b2d0132fc2851c0437062c7a1d216 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 00f88ff8f31b4d747ea955d88bb5e541206c9066 (diff) | |
| parent | c2ca4066838bbbcde4e065134c58f58a89511537 (diff) | |
Merge \\\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe am: 95c9bef53b -s ours am: 00e79982aa
am: c2ca406683
Change-Id: I8c8084567b8bdb954966ccb2360cbc27b89d65d3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions