| commit | 5a5b4ba9fe40605d5e43b7ff25a58f7174509a53 | [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 | 175fdb71c62b0c53537040c84011ea54572aa069 | |
| parent | 8761bfaa8d8755eab65c21b6cb1a0affeefbbe56 [diff] | |
| parent | 271397cfb2b79d1346568209b37b1f57707f924a [diff] |
am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread * commit '271397cfb2b79d1346568209b37b1f57707f924a': DO NOT MERGE - backport of l92a02b31 from master