tree 57ce1139df1233154f885077e7884306091795ea
parent bd74a7022cc548c447ecb368391d2da464dd2b1b
parent 60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe
author Sanket Padawe <sanketpadawe@google.com> 1421534223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421534223 +0000

am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
  Modify getDeviceId() to get device id independent of Subscription.