| commit | d28fcd5bb8e5734a12b83f7cefde759c009e7b6e | [log] [tgz] |
|---|---|---|
| author | repo sync <lockwood@android.com> | Wed Nov 18 20:12:50 2009 -0500 |
| committer | repo sync <lockwood@android.com> | Wed Nov 18 20:13:09 2009 -0500 |
| tree | 8badeba02d7e7705611736b08287663bc7e6a4ee | |
| parent | 5b2f5ced25aee6fec49ffd30abeca2801c98fbd8 [diff] | |
| parent | efd91d7ce01c7bd538fb0ca66d9f5395352211f8 [diff] |
resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp Signed-off-by: repo sync <lockwood@android.com>