tree 19652e700d46bc225a1ff5102111ef2111dd7a9e
parent 3b50e6948b97af10de9e9af276b8e830319dd95e
parent 038bfdccbd40ddd7cfa2aa2a7e9ae44cccdf9b4a
author Chris Wren <cwren@android.com> 1380839719 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380839719 -0700

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

* commit '038bfdccbd40ddd7cfa2aa2a7e9ae44cccdf9b4a':
  add a proto decoder host utility