OSDN Git Service

Merge "fix branch break by adding carrierconfig key" into stage-aosp-master
authorJordan Liu <jminjie@google.com>
Thu, 29 Sep 2016 23:08:12 +0000 (23:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Sep 2016 23:08:14 +0000 (23:08 +0000)

Trivial merge