am fe7a8f0e: am 243ab2f2: Merge "Add null check for cursor in UndemoteOutgoingCallReceiver" into klp-dev

* commit 'fe7a8f0e9efd3d7464184761b83d01ff883fa821':
  Add null check for cursor in UndemoteOutgoingCallReceiver
tree: 2eea6e7c206a8b366cb20eb13306a773fa97208d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags