From: Chen Xu <fionaxu@google.com>
Date: Tue, 3 Apr 2018 06:53:00 +0000 (-0700)
Subject: Merge "A test api to override carrier information" into pi-dev am: b71c76036c
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9693f9dfbbe475817495fb5f8d5332d19ed4b5de;p=android-x86%2Fframeworks-base.git

Merge "A test api to override carrier information" into pi-dev am: b71c76036c
am: 1a1b0608ca

Change-Id: I65560ff163717b050c124fc0ff28a8958440f2b0
---

9693f9dfbbe475817495fb5f8d5332d19ed4b5de