tree 85f476982569943af2be292b01e5ce71edbecb72
parent 4608add3ca161d0415cbba2c072c06c1f1931253
parent 2cc170d2115acf3c8d1f84d6e0727d5bb854fc80
author Winson Chung <winsonc@google.com> 1434138006 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434138006 +0000

am 2cc170d2: Merge "Fixing proguard stripping animation method." into ub-launcher3-burnaby

* commit '2cc170d2115acf3c8d1f84d6e0727d5bb854fc80':
  Fixing proguard stripping animation method.