| commit | 681f68a72ef2124a79302ebc2e82282d14832c46 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Tue Sep 07 18:52:40 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 07 18:52:40 2010 -0700 |
| tree | ac577f777011b0ab1a0de9531f4d4ba9180745b7 | |
| parent | 50cb7dc458e65b75fb69a3a3fed972e7ed913703 [diff] | |
| parent | 59a5d2d5772f41578c72f48df08c0af918b6519c [diff] |
am 59a5d2d5: (-s ours) am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread Merge commit '59a5d2d5772f41578c72f48df08c0af918b6519c' * commit '59a5d2d5772f41578c72f48df08c0af918b6519c': Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE