tree 0171db57efc604df274a8e670d80d6d11049f5dc
parent 5adbea2e2da3a0af1357de05a04534c65a7c9f76
parent b4fd09725b228e2d73518ce06ba413f838e002df
author Vineeta Srivastava <vsrivastava@google.com> 1394218498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394218498 +0000

am b4fd0972: am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev

* commit 'b4fd09725b228e2d73518ce06ba413f838e002df':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]