am 3ff9c116: Merge "Fix ANR in UndemoteOutgoingCallReceiver"

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