tree cba62d0d64153aa2169651696bc238591341d679
parent 39363a4e113a35060cb4299806459463d4a75177
parent 0f3e20658a2386b68f23c71a83e18b9423e939e9
author Qiwen Zhao <zhao@google.com> 1414092450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092450 +0000

am 0f3e2065: (-s ours) Merge commit \'8fa85d20\' into klp-dev-plus-aosp

* commit '0f3e20658a2386b68f23c71a83e18b9423e939e9':
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.