| commit | ee20cbf30a2ef92128ed4eac562d6ee81f55d61f | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 14:31:33 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 14:31:33 2010 -0800 |
| tree | 81f73f8b785e336e550dafaf29fbada98a43a193 | |
| parent | 18d21ef83e5de1cbd3875274f3c5f6eee198af6e [diff] | |
| parent | c8cab72521781091e87049861c4b25fb19197ea4 [diff] |
am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4' * commit 'c8cab72521781091e87049861c4b25fb19197ea4': DO NOT MERGE