| commit | c63e5259dcb77fc720c23bc2d0c4feeb3d677f71 | [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 | 96dcc816650047f9bd54ed5c4dd57b2564997db4 | |
| parent | 7bec0b245a514eaccd5df181bb1e10e3d4710876 [diff] | |
| parent | 95304d5488ba465f19cc788f1c7394218c2ea2d1 [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.