commit | 55b74ef6cd35a1e63493aa65c27784f39c3e0705 | [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 | 917c047492036f03e0e53bc5bf25be02650aaf95 | |
parent | 8d52b886b3b4b13e9df4f3545c89876971588de6 [diff] | |
parent | 944d50d30d738f510fefef6048e1869fde5c4212 [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