tree 36d723c2db314856011a6ffc10c3139587a30b4c
parent d2bef14912c22997d6e369f8cf5d59035071b44a
parent 7e958d0ce0b4acb3c34b84a13b14bfbe6b11d410
author Tom Cherry <tomcherry@google.com> 1563234562 -0700
committer android-build-merger <android-build-merger@google.com> 1563234562 -0700

Merge "Implement new clock wait functions"
am: 7e958d0ce0

Change-Id: I05e1801d8355aa941102bfc9e382afdea77cbea5