diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-18 00:40:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 00:40:14 +0000 |
| commit | 6868e78180b4230436886cc1cf4c915736b16e2e (patch) | |
| tree | 64194f6011bf142b07dd5cbc212feaf7a99e40a9 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cc72f61adfd5c5143f1ffc7695e0339aa1eec5f9 (diff) | |
| parent | 2007a630d4767b4e90f8ed727acd574424c2183c (diff) | |
am 2007a630: (-s ours) am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '2007a630d4767b4e90f8ed727acd574424c2183c':
Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions