tree a7c93caff91ee64511ba20b1998746d334e162b4
parent 17887cd0623d1cc8f225505ecc5b5bec78e75b32
parent f23f725773de1eb394655e657cd12f95f6250b3d
author James Dong <jdong@google.com> 1319095140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319095140 -0700

am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0

* commit 'f23f725773de1eb394655e657cd12f95f6250b3d':
  Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.