tree b31a4718b46776a36841e927a640a9a59aa3524d
parent 8164365f001df2a396d8deb1b4990071549073f9
parent d087ab1a6858f74b4b67788c86ea637643cb7cc2
author Elliott Hughes <enh@google.com> 1438128290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438128290 +0000

am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."

* commit '87998c07a325d8cfa7517516edac7173dbea63bf':
  Move sdcard off PAGESIZE and onto PAGE_SIZE.