| commit | b21b62327c10e92baf1a88e77f1c6d5576a17d62 | [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 | 7420ddfb92ad8264edda6c240ace5b9a999661ee | |
| parent | 96dc45597e53742a2c8453f9ce03f7d501a75668 [diff] | |
| parent | b998f3111df82149567935138945500f33451b1a [diff] |
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505