tree c3822712a7cda521ec63141435202b5b20c07bb0
parent 66af7dd6c71e9d489f826ae4ab68f41a7c43c0c9
parent df69250b75c38e726ea7392c39349d9ef654fac6
author Doug Zongker <dougz@android.com> 1284663372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284663372 -0700

am df69250b: (-s ours) am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread

Merge commit 'df69250b75c38e726ea7392c39349d9ef654fac6'

* commit 'df69250b75c38e726ea7392c39349d9ef654fac6':
  support for ext4/EMMC in target_files and OTA generation