tree 9c23c2f8acacfe22510faa8600c2dfab754ec5ba
parent 150107763d1b5ced8e70992268d7d6fc1888f7dd
parent 33ace979a452301796694ffd64506f082de42f0d
author Dianne Hackborn <hackbod@google.com> 1331836162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331836162 -0700

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

* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.