tree 0e1a9d2e630818a485a555fad06a5e6bd3989dcd
parent 837900884eed174390bc9f7315c55d468fa6f68a
parent 15d7bd9a3d7f1876310d497f5c9522977be1cb16
author Jim Miller <jaggies@google.com> 1296179081 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296179081 -0800

am a85b789a: Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb

* commit 'a85b789a4a6c58c33dda9e5b00a10faee6bbf561':
  Fix 3381322: Update transition animation from lockscreen to home.