tree afdba7ef17a6a27394dc1917664cdcdcf34dde42
parent 695a1d4756cb2fd7fcab98c79b487d29917a418a
parent bb39d905c4efb57689ef335e31be595d70410b59
author Jordan Liu <jminjie@google.com> 1528400767 -0700
committer android-build-merger <android-build-merger@google.com> 1528400767 -0700

[automerger skipped] Merge "Revert "Use resource instead of carrier config"" am: e3021c3971
am: bb39d905c4  -s ours

Change-Id: Ice56e366f57a59c2b0dad6fb2bb757b4f11c10ed