OSDN Git Service

am 651cb804: am fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
authorAdam Lesinski <adamlesinski@google.com>
Mon, 12 Oct 2015 19:40:21 +0000 (19:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 19:40:21 +0000 (19:40 +0000)
commitb8f8ca5139e3268c7447565940b63a543ebe9ed5
treee4cdb689c26ac10fb585d5f68f7721bce2625583
parent41bf75c606fa19b473bc87145f766757525ae96c
parent651cb804b12614094c2b69a2133c8c0b2083556e
am 651cb804: am fe1934e4: Merge "RRO: idmap: allow flock(2) to block"

* commit '651cb804b12614094c2b69a2133c8c0b2083556e':
  RRO: idmap: allow flock(2) to block