diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 18:41:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 18:41:59 +0000 |
| commit | 083146428420dd3daa887d6e9c019e747a604cb5 (patch) | |
| tree | 555b1b4781bc1d5bbabd13acc74957cd66109130 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f5af4a1e34811730b1670ce686948e8dc182936b (diff) | |
| parent | 90312d808f4a5181b5cb99c78e64b7e5d1465895 (diff) | |
am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
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