OSDN Git Service

am 6ef046c8: Fixes ProGuard options.
authorYing Wang <wangying@google.com>
Fri, 11 Dec 2009 01:39:53 +0000 (17:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:39:53 +0000 (17:39 -0800)
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.


Trivial merge