| commit | 8df37bbe10e46f03bdc7d3b7e88eb3a59219a46b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 11:29:10 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 11:29:10 2010 -0700 |
| tree | 1e893914cc936bb367ec993ee9a5ddbfd33791df | |
| parent | a01b7943b59eb869911f6a43b906f44ddefdebed [diff] | |
| parent | a43fed707fcea14b3dd048ef9d9359fcb24b90bb [diff] |
am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373' * commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373': Initial contribution from Sony Corporation.