| commit | 18a8b91a5ee97b7a6e8c0849b542ea765dc738a5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 20 17:53:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 20 17:53:52 2013 -0700 |
| tree | 078f4515cd134fedb1448e3874a77a8d920ae993 | |
| parent | 7ce2f38cb64f5a5ef3bf31f7ce539b74c9c1b10e [diff] | |
| parent | 61abfba7767a4ceb09ba69b03f42ef3bc3828e37 [diff] |
am 61abfba7: Merge "Revert "Use CLOCK_MONOTONIC_RAW for System.nanoTime."" * commit '61abfba7767a4ceb09ba69b03f42ef3bc3828e37': Revert "Use CLOCK_MONOTONIC_RAW for System.nanoTime."