tree 10da860fcff71886af91d082e31f0e1917926848
parent 663d151125561571648f5157e697d1f15c0d1b68
parent 05702ccf79bab63fe02bba9e385cfb3cc8faada9
author Chris Wren <cwren@android.com> 1422666520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666520 +0000

am 05702ccf: am 5b7d28fc: Merge "Turn off debugging for launch." into ub-now-porkchop

* commit '05702ccf79bab63fe02bba9e385cfb3cc8faada9':