am 11d2c3b2: am 8c258ac5: Generalize the device IMEI display for IMEI/MEID and multi-SIM.

* commit '11d2c3b284d7e53d76af708be5fdab5bce01b4c0':
  Generalize the device IMEI display for IMEI/MEID and multi-SIM.
tree: 7881ae0c3b4a7678d6d15eb03e2adfc882e55a28
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags