am 5fbbdf2a: Merge change 27325 into eclair

Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp

* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
  Don't forget to clear "backup in progress" state when finishing a pass
tree: adce850566e5dfc1a51f9bd6b68675bbb55c791a
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE