tree 6a103caa88ddd2491028e23324afffb7ea5087f7
parent 7fd7dc46f590d5446ddc6b6e84adce4353b5cd5a
parent 6ef046c8932989ca97d1cb39413ef99761315a06
author Ying Wang <wangying@google.com> 1260399559 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260399559 -0800

am 6ef046c8: Fixes ProGuard options.

Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.