tree a45f4d74feda9b76277a0c9ced55ad15d82248a1
parent ab470e0d486f7bfe056971e0b099e6b8cdc7c25e
parent d889ce6df1a831f4cff915b4c2a48090ece14b03
author Raphael Moll <ralf@android.com> 1305658342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305658342 -0700

am d889ce6d: Merge "Fix proguard wrappers."

* commit 'd889ce6df1a831f4cff915b4c2a48090ece14b03':
  Fix proguard wrappers.