| commit | a98ae1f7d60a1c7b9c9342ee622cd92f3eced204 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Mon Jan 25 18:13:29 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 18:13:29 2010 -0800 |
| tree | 377af5c7c44dc5b5302c133d9a6a1a03b520aeb6 | |
| parent | f96a91abb6574eb4313946fa65ed69adbc413e44 [diff] | |
| parent | e5b9beae260b451cb3d60583c800b0d223ae256f [diff] |
am e5b9beae: (-s ours) am f6aed0e0: Merge "DO NOT MERGE" into eclair Merge commit 'e5b9beae260b451cb3d60583c800b0d223ae256f' * commit 'e5b9beae260b451cb3d60583c800b0d223ae256f': DO NOT MERGE