| commit | 9dd486267ffe435bcff99a44eb0d315a44f01d96 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:57:29 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:57:29 2010 -0800 |
| tree | b0507a63755050546c50e1f613ec664e89062a44 | |
| parent | 90713bcfdb0f110116a99bd69d9ade74d76eedf2 [diff] | |
| parent | fb5587efa178fddcb59ba11722692fa876498e2e [diff] |
am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7' * commit 'b869c594465d29e96fb841b48c638ddee232bbd7': DO NOT MERGE