tree 10da860fcff71886af91d082e31f0e1917926848
parent 7cfa6837c469415d8ae6a0a30b525ae8ea2196ee
parent b7c85e7b30bb008160d50113c209348c2397325e
author Chris Wren <cwren@android.com> 1414566134 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566134 +0000

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

* commit 'b7c85e7b30bb008160d50113c209348c2397325e':