| commit | 6d9d20c6952ab49e983657a9394a136af535684c | [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 | 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d | |
| parent | 0ff5e20989c08af62db69ce7ace1d756d482f08b [diff] | |
| parent | 23820f6a8969f99722cb32d3ddf243d103af01a9 [diff] |
am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp * commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3': Text selection is broken.