tree 212046cfb90dbba8529d00d2bf64145138a6f899
parent a43677145544d5908e393b959e02f4d4ea070b44
parent dfeaab7419362fd0dd0aaaa1b123323947f7be36
author Kenny Root <kroot@google.com> 1415988176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415988176 +0000

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

* commit 'dfeaab7419362fd0dd0aaaa1b123323947f7be36':
  Call local finish(String) on cancel