tree 2c1d4f175d74a0eebe7676ad505f75cfd1ab5f75
parent 059c84e608f56a0e08a8a3975b99dd9db6a93bef
parent 5f85bb4977d95a1a8148ce28d534586fb1dff45d
author Chris Wren <cwren@android.com> 1387395037 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387395037 -0800

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