tree 416c91b27553e0a46c9bab1bde530a509ed33f7e
parent bf324a1c2809403f2dc18afffd8f1202a99e2ba8
parent 4d85c98d833f6fed01b4bb84427a4b7514f95978
author Dianne Hackborn <hackbod@google.com> 1331836361 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331836361 -0700

am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1

* commit '4d85c98d833f6fed01b4bb84427a4b7514f95978':
  Remove fade animations from framework drawables.