tree 80821468d39a5256276fe8f2501756233cdde383
parent c6ded1ba463f78bbb3bf21dc8362d599c7722e65
parent 033b381b4c91aff4bf76481d0b37fb5f39b50ec2
author Dianne Hackborn <hackbod@google.com> 1284093562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284093562 -0700

am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread

Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.