| commit | 3719f8568e809ffd30f90adc38993256a9d3d066 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 13:20:08 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 13:20:28 2010 -0700 |
| tree | 3cb03ca65d5460fd035ed631dbc82bd86080ac04 | |
| parent | f93951851052f14e3263adff22266b61f487b018 [diff] | |
| parent | 8c11e952305327183db9f7be719e4c94fde15a7c [diff] |
DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc