tree 4512bce02adae0a8fdcbc22814aeda9fd90f7b00
parent d76403d698751cd2505812ab7230c1e4fa5163e9
parent ef6b1b5c7dd2cc6cdcc241de50515486012f5588
author Chris Wren <cwren@android.com> 1392411285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411285 +0000

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

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