tree 0a8ea1a3d46a00d854f6e4cc7fc0cbdb576efcd5
parent 8f97769475278f2f9898cd6be4a220741f5063ef
parent 79804fea52dc6fbf258ed45312a8bfbd2d46fe6f
author JP Abgrall <jpa@google.com> 1414103241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414103241 +0000

am 79804fea: am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev

* commit '79804fea52dc6fbf258ed45312a8bfbd2d46fe6f':
  core: Let the build specify mount options for recovery