commit | 21454ad556283edf003f3c728733e8277ee973c6 | [log] [tgz] |
---|---|---|
author | Dmitri Plotnikov <dplotnikov@google.com> | Wed Dec 02 21:29:48 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 21:29:48 2009 -0800 |
tree | e1c4324198313c881181f64bf281d8a86ccb69d9 | |
parent | feffb7f484a6a02241052f73875088b40a27101f [diff] | |
parent | b6eeec4bf7f905c57b81c6bc6d0789a4d2945058 [diff] |
am b6eeec4b: am 1b6c85b9: (-s ours) DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2 Merge commit 'b6eeec4bf7f905c57b81c6bc6d0789a4d2945058' into eclair-mr2-plus-aosp * commit 'b6eeec4bf7f905c57b81c6bc6d0789a4d2945058': DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2