tree 3a10364a68e0eb430842bf83c6087bff80a78dbb
parent baefbfdb55f18846aa72b386c7e6e11442a6b090
parent 8edd75c8bb0729a10cb39f614183e3e9ae4288e8
author The Android Automerger <android-build@android.com> 1292859536 -0800
committer The Android Automerger <android-build@android.com> 1292859536 -0800

Merge branch 'master' into honeycomb-release

* master:
  removing workaround for fixed animator bug
  updating assets for configure/all apps