Commits
Jean-Baptiste Queru authored and Android Git Automerger committed ca3148edf15M
am 6e85ad7d: resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp * commit '6e85ad7d267f47ba3a367651a70d147725dc26ae': Avoid memory leak in the Shutdown confirmation dialog.
Showing diff tod86927cb58f