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

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