Robert Greenwalt fe0e33495c am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f ...

automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
  Add + code handling logic for SMS Global Roaming

2015-01-21 20:05:30 +00:00

..

android/telephony

am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f

2015-01-21 20:05:30 +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