tree 416c91b27553e0a46c9bab1bde530a509ed33f7e
parent b99b7f51b0b9406fb36189092e8d560c164718fc
parent 42ef93fcc455b9194a7603fed439e8d4490d634f
author Dianne Hackborn <hackbod@google.com> 1331836414 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331836414 -0700

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

* commit '42ef93fcc455b9194a7603fed439e8d4490d634f':