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