tree 9f9cace8b4d6d743c342145d612f77a688aac679
parent 0298da56f410ba0f6a1f1f44deb8e2224f9fc49d
parent e61495c9b82e0bb4893095405518c23a55092f3a
author Elliott Hughes <enh@google.com> 1389149158 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389149158 +0000

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

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