commit | 83f76a20a89f7a84fb6a3cf40f0628ca245e0617 | [log] [tgz] |
---|---|---|
author | Tom Cherry <tomcherry@google.com> | Thu Feb 23 22:07:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 23 22:07:09 2017 +0000 |
tree | df6a9150931a7a2a10a688f9be4adaa3aa0a2ba7 | |
parent | 5f08cb2aeafa2d1b8035d7e5ec84bfe83d4faece [diff] | |
parent | 36ba2fbef7783403e5ea58ef4303498044ba9760 [diff] |
Merge "Make Condition use CLOCK_MONOTONIC" am: 7f932afefc am: 36ba2fbef7 Change-Id: Ib15f34fcb36761dbbc7f3094a3a76a771792b593