tree bd2094bf767a24c8795b5ec20d29c59aa7125f8d
parent 51f42b2d20349490c62b9187bde317f25765e9b3
parent 0de2351e6a6be685e1d68661dcf5f4902898cacd
author Sami Tolvanen <samitolvanen@google.com> 1429290163 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429290163 +0000

am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"

* commit '0de2351e6a6be685e1d68661dcf5f4902898cacd':
  Don't remove existing explicitly stashed blocks