OSDN Git Service

am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev
authorJeff Sharkey <jsharkey@android.com>
Mon, 26 Aug 2013 22:02:53 +0000 (15:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Aug 2013 22:02:53 +0000 (15:02 -0700)
* commit '98d6212327d1c483894b642d5e24c3aac9fca9cf':
  Add CancellationSignal support to file operations.


Trivial merge