Merge "Change mapping of QMI error" am: 5e3275d44e am: 48004a7491
am: 382c3333a2  -s ours

Change-Id: I443a63132f09a1683ca1259adfa1833eac6708bb
tree: 73f3710868370ec815f51220caec0d4ca82abc8b
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk
  7. OWNERS