OSDN Git Service

am 0edffb85: am a2e5d98b: am 2a8c929a: Merge "Implement __fsetlocking."
authorElliott Hughes <enh@google.com>
Thu, 22 Jan 2015 01:59:21 +0000 (01:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Jan 2015 01:59:21 +0000 (01:59 +0000)
* commit '0edffb85fa40987c00dd078111c6218efd5aded7':
  Implement __fsetlocking.


Trivial merge