tree 6c6d0788c0439f73e5e3c428a41eb3ef306ff4ea
parent 840f0fecd87357cadf4b2a0ae96d30b457f89729
parent a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4
author Dianne Hackborn <hackbod@google.com> 1283408240 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283408240 -0700

am a1c69e08: Fix a small bug when granting permissions through activity results.

Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp

* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
  Fix a small bug when granting permissions through activity results.