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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base