tree b41de3da44ad8be35c450884973b98c32dc997e0
parent dc1274c5d0c3b340bf08cc589b46da8caebe4a23
parent 2d68b428b06df4f91ffd12c01ccbac61ce9cb163
author Stuart Scott <stuartscott@google.com> 1421270022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421270022 +0000

am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev automerge: dfb99e8

* commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163':
  Update javadoc and hide getNameSource and getDataRoaming.