tree eea1799c501be24e24fcc7146d5000d46caad596
parent 690804c399f3b68845a566f2e1257e2957621658
parent e93ece70a8d9657d5d08c59db75582d0d057d3bb
author Jean-Baptiste Queru <jbq@google.com> 1255562206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255562206 -0700

am e93ece70: merge from open-source master

Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
  Remove temporary vold logic
  added linux-sh.mk to support SuperH architecture