tree 96c597e4ecfcbeba93c4aee2a580b103931067fc
parent f2bf6d6e705b655a546a9e6435e6acef3a82cda3
parent a48dc39bd55c5ddcd991e08f791fd18d94a0db12
author John Wang <johnwang@google.com> 1283986601 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283986601 -0700

am a48dc39b: Add hangupForegroundResumeBackground().

Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp

* commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
  Add hangupForegroundResumeBackground().