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

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

Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e
---

1a1b0608ca29192472425b99772278a742409aa1