tree 850db5871b2969db45c56d0db536f2d78a51a6fe
parent 4c58d8945281fa2a41e36b4ed3b93fdcf56c1bb4
parent 5da0e2ee2bd695d8644af3b18d045d6046a4fba8
author Elliott Hughes <enh@google.com> 1411535339 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411535339 +0000

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

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