| commit | 512cd2ec2d551305e204f048c1a31fa21c071e4b | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Jan 27 08:12:36 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 27 08:12:36 2011 -0800 |
| tree | 2f0e31c03a395b5dd22f5accc06e9aac445c5964 | |
| parent | 0c5f14bd89c2bc217ddf5f6385c4090af6673567 [diff] | |
| parent | 83fdc69ea0beb715dd45f0a4285cb5d780f8018a [diff] |
am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread * commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a': Squash commits of the following patches, cherry-picked from other branch - do not merge.