am cd9165e6: resolved conflicts for merge of 02542b3b to lmp-mr1-dev-plus-aosp

Browse Source

* commit 'cd9165e64952026f54260910dfe72b32387f6d48':
  Reimplement clock(3) using clock_gettime(3)
  Explain why clock(3) isn't broken.

...

This commit is contained in:

Dmitriy Ivanov 2014-10-04 18:22:14 +00:00 committed by Android Git Automerger

parent 282559de94 cd9165e649

commit 1eb0694888

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available