tree eea6abc90fa8aac731d395ac653fbc30b47af1b4
parent 3bba02e895988097ccb369609b52d3bbd648f2a7
parent 746df94d298f12dab37c277456c54c8241f076ae
author Kenny Root <kroot@google.com> 1406926780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406926780 +0000

am 746df94d: am 087077bf: Make sure a "Cancel" is honored

* commit '746df94d298f12dab37c277456c54c8241f076ae':
  Make sure a "Cancel" is honored