tree e4be490e80d6bf6ac52fea2ee59f6ca45d531f54
parent fdb888262686b694c6d9e742f2c143bb1b1c925d
parent c90ef7584be6a82fdc2ab656433cc773f280cd30
author Winson Chung <winsonc@google.com> 1429292581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429292581 +0000

am c90ef758: Merge "Ensuring that our animation callbacks are not stripped by pro guard." into ub-launcher3-burnaby

* commit 'c90ef7584be6a82fdc2ab656433cc773f280cd30':
  Ensuring that our animation callbacks are not stripped by pro guard.