am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for...
am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '8147ba85'
* commit '8147ba85':
use fs_type "emmc" instead of "block" for consistency (do not merge)