tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent d530a1cd3c8bffc13fbdd5a02ea6e6be84a230a7
parent 0c1420f6faf7fc366f0c8be44d29ddb88e0440cc
author Chris Wren <cwren@android.com> 1392411537 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411537 +0000

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

* commit '0c1420f6faf7fc366f0c8be44d29ddb88e0440cc':