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

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