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

* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
  Bug fix: 3421011 ANR during delete video clip
tree: 0b8accc2d5b58e5121e60ec38a0a2b829f266455
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE