| commit | f1f9b1384787a1b2a6d7c4e90aca564be7d23db1 | [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 | ccd32ebd35cda1e4521b6c3383a10955620f9e7e | |
| parent | 0bbbdb23c36a6ef37882f3e8435241922fdb8bbc [diff] | |
| parent | e0dae0b496b155dce182c1f79e03b1d68e032ab6 [diff] |
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505