Sanket Padawe f0f5eee823 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 ...

automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()

2015-01-20 23:49:54 +00:00

..

android/telephony

Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760

2015-01-20 23:49:54 +00:00

com/android

Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

2015-01-17 22:15:56 +00:00