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

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