tree e09ed3236833be6f3cf3b04fb476c43b749120de
parent f83fc5a5de36ddd6a18b1de995e2dc173c4c84d2
parent 5aadb11c5d7ec17b4f8ebc75cc940ddb726ce1f9
author Jay Shrauner <shrauner@google.com> 1393883315 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393883315 +0000

am 5aadb11c: am fa526431: Merge "Fix ANR in UndemoteOutgoingCallReceiver" into klp-dev

* commit '5aadb11c5d7ec17b4f8ebc75cc940ddb726ce1f9':
  Fix ANR in UndemoteOutgoingCallReceiver