From: sqian <shuoq@google.com>
Date: Wed, 17 May 2017 21:52:07 +0000 (+0000)
Subject: Merge "Remove GENERIC_FAILURE still in ril.h" am: ad3f119378 am: 6a3db1ad1e am: cb110... 
X-Git-Tag: android-x86-9.0-r1~75
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f4707b8319898e7212cebcbe2e6c0d52bed5d16;p=android-x86%2Fhardware-ril.git

Merge "Remove GENERIC_FAILURE still in ril.h" am: ad3f119378 am: 6a3db1ad1e am: cb11038d87  -s ours
am: 991e200ed6

Change-Id: I21e509901ae238896ba936ff76ab6f227ea25bce
---

7f4707b8319898e7212cebcbe2e6c0d52bed5d16