tree 4c47c0b5a3bd0fbe83f8e8b2e76e9d94bf4dc0ec
parent 7d7e5dafaa119123e1dce1d17b5431a0d9461d8d
parent 7a397e0468310e75f39d93fadcd43b7224c9e0c5
author Michael Jurka <mikejurka@google.com> 1346840779 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346840779 -0700

am 7a397e04: Merge "Debug code for bug b/6830207" into jb-mr1-dev

* commit '7a397e0468310e75f39d93fadcd43b7224c9e0c5':
  Debug code for bug b/6830207