am 59a5d2d5: (-s ours) am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT...
am 59a5d2d5: (-s ours) am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit '59a5d2d5'
* commit '59a5d2d5':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE