tree 0073ddd199d9ae2b092e7c6e2993205cb1c52831
parent ae998c7117b4944f57644bbbdcd2047ebaebc2ec
parent 16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd
author Elliott Hughes <enh@google.com> 1389149320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389149320 +0000

am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd':
  SWAP_FLAG_* constants are now in <sys/swap.h>.