tree e16bd6736cfcfacc3153c868b9f936c6b1fd08ba
parent e7f9411f6220c31f0b3c905442b9386dee51e98f
parent 9e421c9410a1b1ec95db298a23e29fb4dd200ea4
author Ethan.Du <a7233c@motorola.com> 1253902016 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253902016 -0700

am 9e421c94: am 3afe20b0: vold: Add support for /dev/block/mmcblk1

Merge commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4'

* commit '9e421c9410a1b1ec95db298a23e29fb4dd200ea4':
  vold: Add support for /dev/block/mmcblk1