tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 8759c5e404c66653b91b7f05948e0ba1caed4a00
parent 5c8107686778e58350a5b7431945802344ddf2d1
author Chris Wren <cwren@android.com> 1422669721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669721 +0000

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

* commit '5c8107686778e58350a5b7431945802344ddf2d1':