tree 10da860fcff71886af91d082e31f0e1917926848
parent b515af45ea1f6d02d0cfa59a57ec715fd21c97be
parent 10383e2992c0f23f1b10ddc31ef9d6d9d36129ca
author Qiwen Zhao <zhao@google.com> 1414566468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566468 +0000

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

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