| commit | e5a07e65c5f0bf8a4374934f6a3d85713cb6161b | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 17 19:21:49 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 17 19:21:49 2009 -0700 |
| tree | 7bbd818f7e9d1c6549a5a8ddf63289bb152d6305 | |
| parent | 9fb956dbdce14e38e38cb45a14610a8c822cbbf0 [diff] | |
| parent | 01ae863611244b745e47190d3ee8ed79db50b549 [diff] |
Merge change 21655 into eclair * changes: resolved conflicts for merge of 696b912e to eclair