| commit | b8f8ca5139e3268c7447565940b63a543ebe9ed5 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Oct 12 19:40:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 19:40:21 2015 +0000 |
| tree | e4cdb689c26ac10fb585d5f68f7721bce2625583 | |
| parent | 41bf75c606fa19b473bc87145f766757525ae96c [diff] | |
| parent | 651cb804b12614094c2b69a2133c8c0b2083556e [diff] |
am 651cb804: am fe1934e4: Merge "RRO: idmap: allow flock(2) to block" * commit '651cb804b12614094c2b69a2133c8c0b2083556e': RRO: idmap: allow flock(2) to block