From: Andreas Gampe <agampe@google.com>
Date: Mon, 6 Apr 2015 23:22:37 +0000 (-0700)
Subject: resolved conflicts for merge of 66650640 to master
X-Git-Tag: android-x86-6.0-r1~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=73bbc7591b902eba7cf4ad2c652f4e4be36d584e;p=android-x86%2Fhardware-ril.git

resolved conflicts for merge of 66650640 to master

Change-Id: I2ece30436199e695c0f2cd5963586a2279578b9b
---

73bbc7591b902eba7cf4ad2c652f4e4be36d584e