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