tree 5fc4f04fc540d627934a6c677e077ef4ac76c4c8
parent 3dba40da1e533c6f419857e4274d9d9dd55868b6
parent 93ca4fc6943a3ebf758c5db98531531b8fe92c98
author Doug Zongker <dougz@android.com> 1285105030 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285105030 -0700

am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)

Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp

* commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98':
  use fs_type "emmc" instead of "block" for consistency (do not merge)