tree 4512bce02adae0a8fdcbc22814aeda9fd90f7b00
parent 3ff20ad022d61bc2ac5944c6e6190ac240f73a9c
parent c2e2363bb3021f640c873c4071859f561db224c6
author Chris Wren <cwren@android.com> 1392411768 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411768 +0000

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

* commit 'c2e2363bb3021f640c873c4071859f561db224c6':
  support multiple files and fix logcat smippets for launcher_protoutil