Merge "Make sure a "Cancel" is honored"
tree: 4552c0d2c059061f2640d7f6274ed80939d31381
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml