| commit | 492301161bdc47a826ce9910dfd81d833671b374 | [log] [tgz] |
|---|---|---|
| author | repo sync <aalbert@google.com> | Thu Feb 24 09:58:25 2011 -0800 |
| committer | repo sync <aalbert@google.com> | Thu Feb 24 09:58:25 2011 -0800 |
| tree | d765c7edd77f07a9882ddd5b8176fd04fecce4dd | |
| parent | 0b270d3d0e20021bfab17bfc0e2c0710ad2e612d [diff] | |
| parent | 1f3dcff8010c8b679eb32fc48ecf7dff131d4f56 [diff] |
resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4