tree 6bb10da609a35ef04bdf3d17d27f33b641a5e835
parent 492b0ca4b127a217305b4adf6f26a627a288f6bf
parent 2ab2e110ce533c4f2095e954f645bdb52081e578
author Elliott Hughes <enh@google.com> 1389149045 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389149045 +0000

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

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