| commit | b6cc76159b4ec1fa7f0f96b4d4fb093b160d0147 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 19 07:57:20 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 19 07:57:20 2010 -0700 |
| tree | 8ad1ae27ac00697934519b72ce6ee89e4b9f0c4b | |
| parent | d45a081c5e34dbadf50f6994dc925d464c675b63 [diff] | |
| parent | 46d810bf465ffd7c3599fe10fac94e0061f482d7 [diff] |
resolved conflicts for merge of 46d810bf to gingerbread-plus-aosp Change-Id: I0a5273d2c057c86c8411fb338772249c3e1e8c09