| commit | 77f5c9542e159cb9f2f2908227212d4add8ce74c | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Nov 10 14:46:44 2010 -0800 |
| committer | Scott Main <smain@google.com> | Wed Nov 10 14:46:44 2010 -0800 |
| tree | 06d9be556d5dc79d074232c7ae346c7e874f25f8 | |
| parent | 17fd21fc0638d8734867b6f189efbabb227f3ae1 [diff] | |
| parent | 5a72672977b2682ee93160124d8fae9d64c16fe8 [diff] |
resolved conflicts for merge of 5a726729 to gingerbread Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15