tree 33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
parent c9f692692f1802afb8706b465ef5e8d91f5cf84a
parent f107d7496c45994b952fabc29cec398ff306cbae
author Jim Miller <jaggies@google.com> 1296179226 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296179226 -0800

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

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