| commit | 232dec8aa6eab028aadd367a5794e88412b4da9e | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Sep 24 09:46:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 09:46:05 2015 +0000 |
| tree | bb7cc105588e76ca8f561c08c5707d0391a17215 | |
| parent | d917d24b08d7d1a287edaf292a50327c9414baa3 [diff] | |
| parent | 7d2740bda8365b7e9a4b1278b75e48076a3b2ac3 [diff] |
am 7d2740bd: Merge "Patch for awaitNanos() for coarse-grained clocks" * commit '7d2740bda8365b7e9a4b1278b75e48076a3b2ac3': Patch for awaitNanos() for coarse-grained clocks