tree 95b34c2c41323007e8fc439a79ea6eaa21be1c2d
parent 6e21817b8ef160fae5e7046745cb11ceab06b2d7
parent 647b437d0772a8c73ac3936b2f8e69d4bd1953d3
author Robert Greenwalt <rgreenwalt@google.com> 1417647634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417647634 +0000

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

* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type