tree 05459836c0d8cce607e4c0684728e645558c9b21
parent cdf8fe869862fc0ae4d03a90c32d0ddf009d63e4
parent 5f85bb4977d95a1a8148ce28d534586fb1dff45d
author Chris Wren <cwren@android.com> 1392410330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410330 +0000

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

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