diff options
| author | Bart Sears <bsears@google.com> | 2015-03-05 00:47:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-05 00:47:15 +0000 |
| commit | 7ddec30f8c85fcf39d0a36adc177574b8a84c5b0 (patch) | |
| tree | b6bb1c3004941092dbab0682f5ae3c9b219ac1a2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 73cb9679fae917ffd72995339c92bd01a10a54e7 (diff) | |
| parent | 3797ee96a76225fda7019eb05ca0de0be2efe6c9 (diff) | |
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
automerge: 3797ee9
* commit '3797ee96a76225fda7019eb05ca0de0be2efe6c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions