am 350535e1: Merge "Allow fcntl F_SETLK on sockets." into lmp-mr1-dev

* commit '350535e123923e206aab04f72a1d0f376d9c85c3':
  Allow fcntl F_SETLK on sockets.
This commit is contained in:
Nick Kralevich 2014-12-12 22:19:23 +00:00 committed by Android Git Automerger
commit 9403e93b79

Diff content is not available