| commit | ca3148edf156f326f598687d1e02362119ac2bec | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 12:24:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 12:24:54 2012 -0700 |
| tree | d7ab185dc9f506ef5f8145d644461c71aaa633cb | |
| 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.