am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb

* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
  Bug fix: 3421011 ANR during delete video clip