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

Browse Source

Merge commit '59a5d2d5772f41578c72f48df08c0af918b6519c'

* commit '59a5d2d5772f41578c72f48df08c0af918b6519c':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE

...

This commit is contained in:

Dmitry Shmidt 2010-09-07 18:52:40 -07:00 committed by Android Git Automerger

parent 92f0724d06 77b534aab2

commit 6a4939a4b1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available