tree 9b49f26684ee42ebe8f71709150e25817dbbe0dc
parent 802dcd4898b7a840151e04ba6cc7e2de4e0594eb
parent 195bb80c1d1baeacd9433869c06434771f7ea780
author Jordan Liu <jminjie@google.com> 1528325473 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528325473 +0000

Merge "Revert "Use resource instead of carrier config"" into pi-dev