am 88d2779f: am 84b89fb8: Forgot to delete the deleteIntent.

Merge commit '88d2779f37cbdd627a7736072f6d0b8b49f737ec'

* commit '88d2779f37cbdd627a7736072f6d0b8b49f737ec':
  Forgot to delete the deleteIntent.
tree: 10bf97bfd60b4ab875d226fff81274a04914b754
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE