tree b0993306b63215d4db6559a86f02bcdb5ff22c55
parent 4924aee9cb1c5988359f3162b6e89689c5b101e1
parent 86f1b643d10e0b5b17ae01db3b81020db87b3295
author Dianne Hackborn <hackbod@google.com> 1287718035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287718035 -0700

am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread

Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'

* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
  Fix issue #3117918: No way to finish a native activity