tree 10da860fcff71886af91d082e31f0e1917926848
parent bb6d5924b806a5ebc11678db79825499de25bf5d
parent 7e4c40875dcb07f80bb418f391702bfa6f7738bd
author Chris Wren <cwren@android.com> 1414566448 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566448 +0000

am 7e4c4087: am c2e2363b: am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit

* commit '7e4c40875dcb07f80bb418f391702bfa6f7738bd':