| commit | a5db0f5f3540ed93caa816a854646b67a81cc28d | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@google.com> | Fri Dec 04 12:25:43 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 04 12:25:43 2009 -0800 |
| tree | 0acb15eb8fb3d6315207b556f9a0ab35f78742f7 | |
| parent | 9b8b540e33514fd99604e8265fd311187be3ddf0 [diff] | |
| parent | 801fd314c77c1e03c34a5172377202d3e28bd4c9 [diff] |
am 801fd314: am c1d449d0: (-s ours) Fix http://b/2305223 (DO NOT MERGE) Merge commit '801fd314c77c1e03c34a5172377202d3e28bd4c9' into eclair-mr2-plus-aosp * commit '801fd314c77c1e03c34a5172377202d3e28bd4c9': Fix http://b/2305223 (DO NOT MERGE)