| commit | d0a6dc225d1b4ebaeb6cebb697ef0d5ebb6daf3d | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:56:25 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:56:25 2010 -0800 |
| tree | b0507a63755050546c50e1f613ec664e89062a44 | |
| parent | 27be597fcbd827e8a349c17af48293816bbc8fb8 [diff] | |
| parent | 12813fd3b75a33bb29802ba16bae9f89728e6454 [diff] |
am 3648f949: (-s ours) am f080a5ad: Merge "DO NOT MERGE" into eclair Merge commit '3648f949ef100668500c9f21d0e8b53d310a393e' * commit '3648f949ef100668500c9f21d0e8b53d310a393e': DO NOT MERGE