| commit | 3ccf06e2c5bcfb10394e8b19d2476914b9a64673 | [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 | 8fb47c5063c3adaaa1978f1202c7b26e7b745034 | |
| parent | cd2354f5407f77f150c1d445a3bb3ec2180db51f [diff] | |
| parent | 3648f949ef100668500c9f21d0e8b53d310a393e [diff] |
am 3648f949: (-s ours) am f080a5ad: Merge "DO NOT MERGE" into eclair Merge commit '3648f949ef100668500c9f21d0e8b53d310a393e' * commit '3648f949ef100668500c9f21d0e8b53d310a393e': DO NOT MERGE