tree cac5bb03748c74fc8b3c7c77278d1e110eb252f5
parent 230df4ab9c69358026634079c1dece849b10d2f0
parent 2e481dac44a85fbd2e812cd4b7ca06a5a090a6ed
author Yu Ning <yu.ning@intel.com> 1459524806 +0000
committer android-build-merger <android-build-merger@google.com> 1459524806 +0000

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

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

Change-Id: I0c0c35c7839719ec37099d08f0979bb3fef8ed63