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

* commit '5aadb11c5d7ec17b4f8ebc75cc940ddb726ce1f9':
  Fix ANR in UndemoteOutgoingCallReceiver
tree: e09ed3236833be6f3cf3b04fb476c43b749120de
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags