tree 35321664338ede8e0f4d8ed01cd8fe9b2115fad2
parent f41cd2e81ba403a8da3da3c054155b570a4d304a
parent 447269254f88e2e1f5c52ead79d0252c3842525c
author Nancy Chen <nancychen@google.com> 1414014038 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414014038 +0000

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

* commit '447269254f88e2e1f5c52ead79d0252c3842525c':
  Generalize the device IMEI display for IMEI/MEID and multi-SIM.