| commit | 6c9687c05aead139d549da6cfcccdfd65d2f4d26 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Fri Dec 04 17:37:14 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 04 17:37:14 2009 -0800 |
| tree | 6417a74fbc1369c3bfe53deeb2ac6ead12093c4c | |
| parent | a8c0888cc227b4fd4da23b84b2ef16f5144a8bee [diff] | |
| parent | daa8318de3c63a28eccb52546c230e5c5caee962 [diff] |
am daa8318d: (-s ours) DO NOT MERGE. This is cherry picked from https://android-git.corp.google.com/g/#change,28737 Merge commit 'daa8318de3c63a28eccb52546c230e5c5caee962' into eclair-mr2 * commit 'daa8318de3c63a28eccb52546c230e5c5caee962': DO NOT MERGE.