tree 36d723c2db314856011a6ffc10c3139587a30b4c
parent 2b072a95d87be6e7f8b52522939aaa2fa0c994c9
parent 472c9ef8af507e6a6da17cf4e30c406524f6f697
author Tom Cherry <tomcherry@google.com> 1563237845 -0700
committer android-build-merger <android-build-merger@google.com> 1563237845 -0700

Merge "Implement new clock wait functions" am: 7e958d0ce0 am: 32531b709a am: d96e7a2f44
am: 472c9ef8af

Change-Id: I131b56c678476f7e2d30a4f6374eef1b7761543b