tree bddbb3ab2fde3d7fa9de2aa3ad5ca256854fc169
parent 79ba4bf4b3ede4dc180245a7899a731766394d8f
parent 46875614b6c744a8054a045bc0d9dc271cb9f2ff
author Dmitry Shmidt <dimitrysh@google.com> 1253914151 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253914151 -0700

am 46875614: Add wake_lock delay after start/stop commands

Merge commit '46875614b6c744a8054a045bc0d9dc271cb9f2ff' into eclair-plus-aosp

* commit '46875614b6c744a8054a045bc0d9dc271cb9f2ff':
  Add wake_lock delay after start/stop commands