| commit | 60a4cd5e348ae263d209a7f64510826825848208 | [log] [tgz] |
|---|---|---|
| author | repo sync <chiachi@android.com> | Tue Jun 30 11:06:14 2009 +0800 |
| committer | repo sync <chiachi@android.com> | Tue Jun 30 11:09:06 2009 +0800 |
| tree | d3beeb9ae9744817c3067a50eed6c2e11fa56e6d | |
| parent | 24f3a2fe8f4b63497654a774af11615cd70b4c2b [diff] | |
| parent | abb0855010a918747a199367d99b5ca5ade105e2 [diff] |
resolved conflicts for merge of abb08550 to master