tree cba62d0d64153aa2169651696bc238591341d679
parent db9eca39e9cc1386b4c48300c294f0349c6d9762
parent c2e2363bb3021f640c873c4071859f561db224c6
author Chris Wren <cwren@android.com> 1414085554 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085554 +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':