tree 12db71406e3cab37dfddf765755475202ce2adfe
parent 7a8d7bab4b24ff60a87aa87a6c5723f892327f1f
parent 4057273b62b54c5913afa46ce4a1dc3e497845dd
author Elliott Hughes <enh@google.com> 1459875108 +0000
committer android-build-merger <android-build-merger@google.com> 1459875108 +0000

Merge "Fix Condition::waitRelative."
am: 0d6bb55

* commit '0d6bb55a39c453785db67039fca5e72e75286d5e':
  Fix Condition::waitRelative.

Change-Id: I4536446eef6e2c9a0367e591aa4c811a15504410