| commit | ee6ceed44aa5d6bb88de8ee1e3cf351754667eac | [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 | af2b6a6ebf410af827603e463c6bd802ba9aeb07 | |
| parent | 70745094cc6013ec9dcab0952016cff11d62e1fe [diff] | |
| parent | 5eb239555c293a42cd7e0f1cf9dfed0453b292cc [diff] |
resolved conflicts for merge of 5a726729 to gingerbread Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15