am 598f3e9c: Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev-plus-aosp

Browse Source

* commit '598f3e9c4a48a4f4cbae6fb163f378d9fd1e6321':
  Add futimens.

...

This commit is contained in:

Elliott Hughes 2013-08-09 06:07:10 -07:00 committed by Android Git Automerger

parent 8e6855e0a8 598f3e9c4a

commit a7fc5bde71

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