tree 21e5bbe7ae78769130a2ea2d6af9b85305f46c3a
parent 431b65d11fa79ee1acf55e1de0d074fe9913a51d
parent 98f81182fb61953e0712bd788941710b6ad842c2
author Robert Greenwalt <rgreenwalt@google.com> 1417724635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417724635 +0000

am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type