diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-22 01:11:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 01:11:49 +0000 |
| commit | 20512991d0e26414f733ddd8250e028fe60a8ac6 (patch) | |
| tree | cd87ffb082261147d6b1b7899167d1c78ca870c6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c3443ed3ded30a2a59be9e147d4f88099750fde4 (diff) | |
| parent | 0195207b37e9b43199b79b4b56cea1c07b7f466f (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: e8af546d37
am: 0195207b37 -s ours
Change-Id: Ifd5ba0069771ad66411a8090a8c241f39b96c5c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions