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

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