| commit | f5e18154b0ca85cc69bd94407fd3d5a01b836894 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Oct 13 01:24:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 01:24:48 2015 +0000 |
| tree | da8a7c4dd41fab209c4e829acd1e38dcd4de860e | |
| parent | 81892b095bfcbcf20130c29db3d3c319ca8b971c [diff] | |
| parent | b8f8ca5139e3268c7447565940b63a543ebe9ed5 [diff] |
am b8f8ca51: am 651cb804: am fe1934e4: Merge "RRO: idmap: allow flock(2) to block" * commit 'b8f8ca5139e3268c7447565940b63a543ebe9ed5': RRO: idmap: allow flock(2) to block