tree 10da860fcff71886af91d082e31f0e1917926848
parent 37e0782361c4323afbf76b53817440c90665882d
parent ee81229929c454ad9e48a6fb3cf459f091e941d5
author Chris Wren <cwren@android.com> 1414566427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566427 +0000

am ee812299: am f810f75f: am bf597a68: am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit

* commit 'ee81229929c454ad9e48a6fb3cf459f091e941d5':