Skip to content
Commit 651cb804 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am fe1934e4: Merge "RRO: idmap: allow flock(2) to block" 

* commit 'fe1934e4':
  RRO: idmap: allow flock(2) to block
parents 287cd2d1 fe1934e4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment