tree ea817313398659f6358961de07204ebefb457135
parent 59a735b2a354f621447cdbbca1eb31901c4949c3
parent 6e8455d65cfa3b107edd41ffd25941cc6ff5e5a5
author Iliyan Malchev <malchev@google.com> 1350947751 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350947751 -0700

am 6e8455d6: am a53cf1de: Merge "initial mako-specific dumpstate" into jb-mr1-dev

* commit '6e8455d65cfa3b107edd41ffd25941cc6ff5e5a5':
  initial mako-specific dumpstate