| commit | cd2e2642125d54352130233d29d080ab57fe981d | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Feb 10 14:48:02 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 10 14:48:02 2011 -0800 |
| tree | 639fb688af30252241124cadd35f2cf26fa8afa1 | |
| parent | 9ebc6b341b76ca0a47daed022929f0b4dd7b8623 [diff] | |
| parent | aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3 [diff] |
am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp * commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3': Text selection is broken.