| commit | 7ac5d3748dab69dd25651d2f5f4539b40cfbd5ae | [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 | 470a9ec8f1c0c0eac874891f4a958d8f7d1e8be9 | |
| parent | a488bc40a330e0483fa702614922b843c8775cc2 [diff] | |
| parent | 7601f575aafd6ff0c17728e208aa46be3f86b55f [diff] |
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505