diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 18:29:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 18:29:25 +0000 |
| commit | 2287879039556ad3c8fce58974e2396b4a2dab45 (patch) | |
| tree | fcf951e96ead62f6808fcddc3c05508ea1fdb6e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b43a7eefb75b2a6397d738055389567e1faa21d9 (diff) | |
| parent | 93f94c2ca5bf23533fc5a9bd70a4795584d20618 (diff) | |
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions