tree e5ac9331b0244fb7525bc0f09f19c331cba62ac9
parent ba27ead75f441e5efc8e00ad4fdaa5f440ac602a
parent 8f5dde9c9de938296c6d2c60f42267b179cc55bb
author Hall Liu <hallliu@google.com> 1482270075 +0000
committer android-build-merger <android-build-merger@google.com> 1482270075 +0000

Merge "Add CarrierConfig option to not display HD icon" am: 8b41f61b0e am: 431350d9dd am: a47260455d  -s ours
am: 8f5dde9c9d  -s ours

Change-Id: Ibf4cb2745299a06407672cd0fa6a0b7a73a92747