tree af44882f70b37e8207290bee4c3005dce602de9a
parent e6b10121ad2326d8c5d9d86a3a3ff50e3f8b889f
parent 5da0e2ee2bd695d8644af3b18d045d6046a4fba8
author Elliott Hughes <enh@google.com> 1411535304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411535304 +0000

am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."

* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
  bionic has O_RSYNC now.