tree 1308819efeea3bbdbef19abd330659e5a2c4ed5e
parent 41b92c20f82d10291bd65d68111edafbf53a9471
parent 8e9cacc5eb1618b34373ac9131561560a56b4661
author The Android Open Source Project <initial-contribution@android.com> 1279037422 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279037422 -0700

am 8e9cacc5: merge from open-source master

Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661'

* commit '8e9cacc5eb1618b34373ac9131561560a56b4661':
  Disable building libdiskconfig on non-Linux hosts