tree fe590451ac7fa6b7edd846e662b728dbc24f22b3
parent 51e4acb29d87fafc0d790fadfd31d0c1410521f5
parent 658d3c8b3ad1c10f243012531f05127de4874fa3
author Shishir Agrawal <shishir@google.com> 1456335191 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1456335191 +0000

Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev