tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 043d74855cc1cd4fe06d4b98a46f25cad020dd4b
parent ed3149c5f63c11ae3b01446df83c54d9054ec020
author Chris Wren <cwren@android.com> 1392411042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411042 +0000

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

* commit 'ed3149c5f63c11ae3b01446df83c54d9054ec020':