tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent c6bcbe310d820cc7c7c06218821f996a33a4b51d
parent 3fd097f8a81b57046f7200f659211971025ad7bf
author Tao Bao <tbao@google.com> 1440684832 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684832 +0000

am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."

* commit '3fd097f8a81b57046f7200f659211971025ad7bf':