tree bd7b3438b6cdaf727c9ea84d2123fef08d1b5bed
parent c1e808c3747a145dfe98cf10f774a684cdaf0db6
parent 34b90a8ce3b3721a3bfcee15c780cdf45f712585
author Meng Wang <mewan@google.com> 1458236117 +0000
committer android-build-merger <android-build-merger@google.com> 1458236117 +0000

Merge "Add new key in CarrierConfigManager for ICCID display." into nyc-dev
am: 34b90a8

* commit '34b90a8ce3b3721a3bfcee15c780cdf45f712585':
  Add new key in CarrierConfigManager for ICCID display.