| commit | a1f8afa930ccaa0241892f25d37325743661755a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Apr 15 20:52:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 20:52:52 2014 +0000 |
| tree | 28e788897f53dadb9504777175e7184e0d0dd72e | |
| parent | e65e2134444a28199c3ede61a692457c73478f94 [diff] | |
| parent | d954c6b92024fbb183ea3acb7366a39765a6e3c0 [diff] |
am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks." * commit 'd954c6b92024fbb183ea3acb7366a39765a6e3c0': "desktop" linux has Posix clocks.