Merge "Recalculate in-call state when activity ends." into klp-dev
tree: e903abdf7f3bbc93802a65f77c12b097b92c9487
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags