tree 6da578352f0ec62fa7ac9e5eff63fdb03a1af516
parent b922c820c007b0227480117a29e7cc797cd650c8
parent 3b0d387b0573657358c24208c8e201d377311132
author The Android Open Source Project <initial-contribution@android.com> 1373563022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373563022 -0700

am 3b0d387b: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3b0d387b0573657358c24208c8e201d377311132':
  Remove debug tag from the clatd.conf build target