am c1a3f99c: am c77fd5c9: Merge "InCallService meta-data [3/4]" into mnc-dev

* commit 'c1a3f99cdbccb8073fb00e1469617ccbc51dd232':
  InCallService meta-data [3/4]
tree: f41238660ec431ac8aa188681d30dfe4e987b453
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags