tree edc84c4c93a0e08edbf4e58aed30a55dcefdd6cc
parent a295a3908befeb9dd30203c612d95411d68492ed
parent d0f74ae081bac9a9c8f7faf9288305647735d743
author Dmitry Shmidt <dimitrysh@google.com> 1283906035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283906035 -0700

am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread

Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE