tree f054d77c1c27589db1e63fdbc3873f7f6dd95bf5
parent 43e90cb71376f97cf272b9a85f900b328e7b9750
parent 6ee8c8a8cb2391241985b9c61a86271f00a3d9ce
author Kenny Root <kroot@google.com> 1415993515 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415993515 +0000

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

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