tree c189584febec6571f69620e9b3e0c68baaf83706
parent f76f6f5c63df5f22f723cde884dbfbe7a57e4c20
parent 7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef
author John Wang <johnwang@google.com> 1287022496 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287022496 -0700

am 7a26ebdf: am 844a6b3c: Turn off additional debug.

Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
  Turn off additional debug.