tree ec3f47bca32b7d77a1cd64c1f0c636dc8e098a8f
parent 29ae3d08fe417dbc0d1ce30eb59f1674c0c758a6
parent e6fcfba0514df3c0b68db1de32c2048c61c3e4e1
author Jordan Liu <jminjie@google.com> 1507852552 +0000
committer android-build-merger <android-build-merger@google.com> 1507852552 +0000

Merge "Disable the charge popup when the roaming is turned ON"
am: e6fcfba051

Change-Id: I108d0c108f1eedb2fe7bb5776dfa021d087e95a4