tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 941197f0f19644d676d2e79ebccf7855a7cfbdb3
parent 6d6ab373c3e2990b2966731bed08dae3d7863c10
author Chris Wren <cwren@android.com> 1422685348 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685348 +0000

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

* commit '6d6ab373c3e2990b2966731bed08dae3d7863c10':