| commit | 3c5b56d46f77eb5e36ec75bb9ed3d25ab7762fe3 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Thu Sep 09 14:14:05 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 09 14:14:05 2010 -0700 |
| tree | a7a60b060ff20688e658361020175edce511f012 | |
| parent | 057d5e9824a01a03c13d5a32d3c7f5023d01586e [diff] | |
| parent | 6eea4cd1872bcc205b1f44a6ccaf410c23eb0aee [diff] |
Merge "resolved conflicts for merge of ff545380 to master"