| commit | 8606b3e4a0e2322f3c215d5fa35379f2946aa601 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Feb 16 10:58:34 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 16 10:58:34 2011 -0800 |
| tree | 5125bd4565fbc5fb7e132238543ef985cf0547f0 | |
| parent | 3064b9e18e7c0a1c8eabb3d9933efd49180079da [diff] | |
| parent | 439a015baa65c68ff52c7ac92dd522488c16f0d1 [diff] |
am 439a015b: (-s ours) am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread * commit '439a015baa65c68ff52c7ac92dd522488c16f0d1': DO NOT MERGE - backport of l92a02b31 from master