tree e1f321305ca92116c13996942202400a1804ec35
parent b099c6f7a9295e49b225f16d943c00959677d312
parent de2d3b5267b836d991815918dcdbde91445da55d
author David Zeuthen <zeuthen@google.com> 1441842279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441842279 +0000

am 80364b94: am 6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect."

* commit '80364b94bc2f017f0d8e47c0fdb0d208fd33ff09':
  fs_mgr: Fix ENOMEM behavior when dealing with slotselect.