tree 7d3e8177f29f33d4765a48120210c4d4da3ca254
parent d2bbc1e2a0aa608a67ab169adab7cd15e6fa9e0d
parent a255d5de80f460559e760a73f6f28fca85594eab
author Sanket Padawe <sanketpadawe@google.com> 1464914890 +0000
committer android-build-merger <android-build-merger@google.com> 1464914890 +0000

Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev am: 1a6b6fc266
am: a255d5de80

* commit 'a255d5de80f460559e760a73f6f28fca85594eab':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I8331df0c8c9a2e830554d7a29e6f39b9a026c28f