| commit | 8c8b8d8875e2305c9c1f7e1e41a410c31e1d0de2 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue Jan 12 11:57:02 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 12 11:57:02 2010 -0800 |
| tree | 3870e77f24d875c74f6db4d5de77cf63be37e04c | |
| parent | df36dc2c275205a89a17c604f797d5371128ba7c [diff] | |
| parent | 060d4f411ec42385cf2f2bda186c881724455102 [diff] |
am ba5220fc: (-s ours) am ce63c639: Merge "DO NOT MERGE." into eclair Merge commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8' * commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8': DO NOT MERGE.