tree 197e0722b8363fccfb3cbb959d9af7209e7b4509
parent dc00a367f6e8814352031da9626288379de3cd32
parent 44c4b858ec3892243cc085faf8a96b44bb8a5a9c
author Elliott Hughes <enh@google.com> 1453850250 +0000
committer android-build-merger <android-build-merger@google.com> 1453850250 +0000

Merge "Fix lockf for LP32." am: a449fafc89
am: 44c4b858ec

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