tree 9b346ae340d59f15f68d3bf1619e67670916ebf5
parent 3cb327bf90371882afa4a6f8ec89dfda9e75ff08
parent 1e1c060378f4414d60eaf718e1623822c75005bb
author Jordan Liu <jminjie@google.com> 1475193232 +0000
committer android-build-merger <android-build-merger@google.com> 1475193232 +0000

fix branch break by adding carrierconfig key am: e787323e03
am: 1e1c060378

Change-Id: I0d76442494289c6b920c84a7c07bd635f515da88