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