tree 1377d19e92a9346bdd60767495d9c487d5ff6b9c
parent 31b5d4b98e8079a1d97aff8dc3e0824b95d1e294
parent 1b217b0c6d36b7f6f550f45d2b694b0f154a22b7
author San Mehat <san@google.com> 1260402343 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260402343 -0800

am 1b217b0c: system: vold: Conditionalize build (default on)

Merge commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7' into eclair-mr2-plus-aosp

* commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7':
  system: vold: Conditionalize build (default on)