tree 8b61db92e6ece51034ed67c20612b0ad90f1f3e7
parent 0c5363c8571eef11eeb21a575da941565c34191e
parent 529113098350c026ec521258d4c6fba51f285a48
author Ying Wang <wangying@google.com> 1275509352 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275509352 -0700

am 52911309: Cherry-pick unbundled build changes from master

Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp

* commit '529113098350c026ec521258d4c6fba51f285a48':
  Cherry-pick unbundled build changes from master