| commit | f2bfa76cf8937cb98b0205da1ed7f8267bd5714b | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Fri Jul 23 12:21:48 2010 -0700 |
| committer | Evan Charlton <evanc@google.com> | Fri Jul 23 12:21:48 2010 -0700 |
| tree | a4b6c317090096028d132457326eccf8946a0440 | |
| parent | ef5bf469fab7166373b10db6c88e6c3cf0e64217 [diff] | |
| parent | 121a78733a9ff105efabbff3314548f973a9105b [diff] |
resolved conflicts for merge of 121a7873 to gingerbread Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e