tree b8f1389ba035bdbc43a5957ff7906229be48bc15
parent f8f2f8b03f667133be1414b525658b954f8fed20
parent 1a529ddaa71a3dfa50586a145ebfa502bea85e1d
author Craig Mautner <cmautner@google.com> 1382643168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382643168 -0700

am 1a529dda: am bcd68186: am d0d23f6a: Merge "Disable time consuming debugging code." into klp-dev

* commit '1a529ddaa71a3dfa50586a145ebfa502bea85e1d':
  Disable time consuming debugging code.