| commit | ab9cd1f87587f4f0b80ba7c5da7404bbf2e5e085 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Wed Aug 25 17:48:47 2010 -0700 |
| committer | Robert Greenwalt <robdroid@android.com> | Wed Aug 25 17:48:47 2010 -0700 |
| tree | aa88b7dd489184f5533f8942d588aeda663c1ede | |
| parent | 6d35200277c3d9a32b63d43983800e2fa30d70a2 [diff] | |
| parent | 209638b62181c3658b7e1f995d91c94217e7a66a [diff] |
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505