tree 578637a55a7acc8669116d3cab54719c9f37891c
parent aedfea603baa0974a3418f83c83b59cc01fc2f6b
parent e3546c6cb66f2d100de5d0a249f53a783d2d5222
author Yu Ning <yu.ning@intel.com> 1459525070 +0000
committer android-build-merger <android-build-merger@google.com> 1459525070 +0000

Merge "reference-ril: Stop using pthread_cond_timedwait_relative_np()" am: 2e481da
am: e3546c6

* commit 'e3546c6cb66f2d100de5d0a249f53a783d2d5222':
  reference-ril: Stop using pthread_cond_timedwait_relative_np()

Change-Id: I27b6544423c1ee9fe98c18df452b035f37049b76