OSDN Git Service

Merge "Fix lockf for LP32." am: a449fafc89
authorElliott Hughes <enh@google.com>
Tue, 26 Jan 2016 23:17:30 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jan 2016 23:17:30 +0000 (23:17 +0000)
commit35a96b2af41664617a90719b40a929cc6572e52a
tree197e0722b8363fccfb3cbb959d9af7209e7b4509
parentdc00a367f6e8814352031da9626288379de3cd32
parent44c4b858ec3892243cc085faf8a96b44bb8a5a9c
Merge "Fix lockf for LP32." am: a449fafc89
am: 44c4b858ec

* commit '44c4b858ec3892243cc085faf8a96b44bb8a5a9c':
  Fix lockf for LP32.