OSDN Git Service

Merge "Remove GENERIC_FAILURE still in ril.h" am: ad3f119378 am: 6a3db1ad1e
authorsqian <shuoq@google.com>
Wed, 17 May 2017 21:48:36 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 21:48:36 +0000 (21:48 +0000)
commit991e200ed688000cc577c0a56a991942e0bce504
tree1f502037e466c5e181fe691df8f06b52588b067f
parent4e71be6705c59c6007b1ff97315216607007f8e0
parentcb11038d8765caf0ce29300cfac5f89667329ae0
Merge "Remove GENERIC_FAILURE still in ril.h" am: ad3f119378 am: 6a3db1ad1e
am: cb11038d87  -s ours

Change-Id: I14e0c2273b4b0a998abea112ee5c1608dea33c19