diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-11 12:24:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-11 12:24:54 -0700 |
| commit | ca3148edf156f326f598687d1e02362119ac2bec (patch) | |
| tree | d7ab185dc9f506ef5f8145d644461c71aaa633cb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d86927cb58fbd41abe2d53735022cf0c49d9d450 (diff) | |
| parent | 6e85ad7d267f47ba3a367651a70d147725dc26ae (diff) | |
am 6e85ad7d: resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp
* commit '6e85ad7d267f47ba3a367651a70d147725dc26ae':
Avoid memory leak in the Shutdown confirmation dialog.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions