am 2bc98d35: (-s ours) Merge "Implement multi-SIM capabilities (3/6) [DO NOT MERGE]" into lmp-dev

* commit '2bc98d35f3a491b7bc46c27863d266c38abe5ef0':
  Implement multi-SIM capabilities (3/6) [DO NOT MERGE]
tree: 3b31fea25df8e192b5caeb61699e6f683db23569
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags