tree 7e5ede576b4e7db569c81a2004b2b84c91c9c551
parent 878df18c48fa5f0282cee5ded80238f64826cf84
parent 132a55375e89d809e1cc116aa4cca49e2351294a
author Robert Greenwalt <rgreenwalt@google.com> 1389142216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389142216 +0000

am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""

* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"