tree fc36213cce9d41e92a910194ae6db8a25b918ef1
parent 1e424d8ef54c4056416d19b54ef016304c957fe1
parent bc836220f3ae6afd5d6409e0c9dfaaafc1ce4afa
author Elliott Hughes <enh@google.com> 1389148948 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389148948 -0800

am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

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