From: Steven Moreland <smoreland@google.com>
Date: Thu, 20 Apr 2017 01:48:20 +0000 (+0000)
Subject: Merge changes from topic 'system-vendor-internal-pick'
X-Git-Tag: android-x86-8.1-r3~23^2^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d92a0e60d2;p=android-x86%2Fhardware-ril.git

Merge changes from topic 'system-vendor-internal-pick'
am: 0ce4693d8f

Change-Id: Id0e53b2ab17df9adc81ceca8d75c798797c9d96c
---

d92a0e60d2248649b09491ec9ba948dd55c870ff