| commit | 83536cee2b2b5445c5ba0b22531c23890b82da41 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 10 18:03:35 2009 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 10 18:03:35 2009 -0800 |
| tree | 04ee523f4a843092b629a28bc706d6060a9df401 | |
| parent | 0cda59112526c03f3b8be0eb885926b7515df756 [diff] | |
| parent | 1179efbb3b8856eb8160e2dd67a300a5d64e8e98 [diff] |
Merge change I1179efbb into eclair-mr2 * changes: resolved conflicts for merge of ba56915a to eclair-mr2