tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent af787b5607c5a25779e49f6ce94a6cb73601d227
parent 3dc7177c1b154fbdb92778dd0bb404bd3fca3090
author Chris Wren <cwren@android.com> 1392410152 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410152 +0000

am 3dc7177c: am 038bfdcc: am f0481bf3: Merge "add a proto decoder host utility" into jb-ub-now-indigo-rose

* commit '3dc7177c1b154fbdb92778dd0bb404bd3fca3090':