am 6ee8c8a8: am dfeaab74: Merge "Call local finish(String) on cancel"

* commit '6ee8c8a8cb2391241985b9c61a86271f00a3d9ce':
  Call local finish(String) on cancel
tree: f054d77c1c27589db1e63fdbc3873f7f6dd95bf5
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml