am 6c7c0c99: am 73170a73: Merge "Make sure a "Cancel" is honored"

* commit '6c7c0c99368109920afc6f0afd4d92929abc3e97':
  Make sure a "Cancel" is honored
tree: eea6abc90fa8aac731d395ac653fbc30b47af1b4
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml