tree 69eef611c1d94537f0ecfe64c4a2ba76b88e5f54
parent 7a8e0399c6b8b0b02cd596d0949acc8364500887
parent 8edebe1f2877bb0e64321342ff3984e2ab9ab2c3
author David 'Digit' Turner <digit@android.com> 1301068177 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301068177 -0700

am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"

* commit '8edebe1f2877bb0e64321342ff3984e2ab9ab2c3':
  qemud: disable debug traces