tree c7252b00234946071b62282fc50167e6f096a84d
parent 9b64b09a82f0319271b254a5807c2228da1ba9b8
parent 6ad7942740b95adfac0e274c3bdbf54925403dd7
author Daniel Sandler <dsandler@android.com> 1272057299 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272057299 -0700

am 6ad79427: Merge "Fix proguard flags." into froyo