tree 1db246966971c4db2a0624374cbe21dae02e4c7b
parent a1b948afdb5a46e168cf59ea4045b63722ee8b47
parent 2476ec994d449d31c89571723b4b17826639c1bf
author Ying Wang <wangying@android.com> 1373652716 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373652716 -0700

am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"

* commit '2476ec994d449d31c89571723b4b17826639c1bf':
  use ext4 instead of yaffs for the emulator