am 6ef046c8: Fixes ProGuard options.

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

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.