| commit | d0fcacd949cd8b42b37d238a4ba74e3c29325277 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Aug 26 15:02:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 15:02:53 2013 -0700 |
| tree | 66e219c4347ffebee7f5a046a1193ba1bd812420 | |
| parent | 43bc44f51250bf2568c2f64c106eb4a59b703bb2 [diff] | |
| parent | 98d6212327d1c483894b642d5e24c3aac9fca9cf [diff] |
am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev * commit '98d6212327d1c483894b642d5e24c3aac9fca9cf': Add CancellationSignal support to file operations.