tree f8f3abb083808a9e600599c83f9aaeada4782eca
parent 0d732fe68c6c68e93b6ca33d75e92b55ef95a97a
parent 839734bbe502c876237a0473823b606803051825
author Matthew Xie <mattx@google.com> 1339731075 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339731075 -0700

am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev

* commit '839734bbe502c876237a0473823b606803051825':
  Handle ENITR failure for Headset control channel.