tree ab2d48836f85f0211670192376b17ddfb920bf0f
parent c9ebb58623430b73e8f5a30c5ac34b770f29359a
parent 3dba40da1e533c6f419857e4274d9d9dd55868b6
author Doug Zongker <dougz@android.com> 1285094301 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285094301 -0700

am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)

Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6'

* commit '3dba40da1e533c6f419857e4274d9d9dd55868b6':
  remove the notion of "root path"; support mixed flash types (do not merge)