tree b29dfbc02d493928e14b7f3ae8f8e66c353b8ef7
parent 4cd7f2d8c745977d3b12fdb26a13a1373832c6b8
parent 67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb
author Tim Murray <timmurray@google.com> 1391467520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391467520 +0000

am 67d9e0be: am 0cc37f4c: Merge "Fix debug context."

* commit '67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
  Fix debug context.