tree f095959865dfa25a1f6eb31360500c62a452d1c1
parent 84fa15ce63a5259823b4fe79e04b4a7cc8be98ad
parent 638918a2681cff345b9e3bd5ff7b170a874125dc
author Amith Yamasani <yamasani@google.com> 1379701203 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379701203 -0700

am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev

* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep