tree b531b6951b95645d21c4e1fd6757be89d90f1728
parent 6d06baddbc2ba6cace5181cb649626136d000ca6
parent efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051
author Michael Jurka <mikejurka@google.com> 1326393954 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326393954 -0800

am efcb5405: Merge "Fix NPE caused in LauncherViewPropertyAnimator"

* commit 'efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051':
  Fix NPE caused in LauncherViewPropertyAnimator