tree ee12af33f2a325509aee519be1b13f7ce7752a9f
parent 5497e99c4a749a46b8e9f8312d01639987ba81a0
parent a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b
author Stuart Scott <stuartscott@google.com> 1421271215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421271215 +0000

am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

* commit 'a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.