OSDN Git Service

am baefd248: am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.
authorYing Wang <wangying@google.com>
Fri, 11 Dec 2009 07:41:26 +0000 (23:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 07:41:26 +0000 (23:41 -0800)
Merge commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886'

* commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886':
  Fixes ProGuard options.


Trivial merge