Merge "Remove GENERIC_FAILURE still in ril.h" am: ad3f119378
am: 6a3db1ad1e

Change-Id: I702352310892f5e88c0d28f0cf805c08f9c2a5af
tree: 4f32057a73c9398f9aca9b0d00914b39f24cc479
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk