Merge "Fix bug in getCallWaiting api."
am: eb4e5318f2

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