| commit | e871be666b80d3f6a9a9a44ee400ab661be212e4 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 11 17:00:23 2009 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 11 17:00:23 2009 -0800 |
| tree | 49061c792a5f21011de4330cb3b0d004ac483755 | |
| parent | 6139bf60e83753750fa1009de6da85033dad1820 [diff] | |
| parent | 735f45538650728e9ca9856b9ff87ec54c972f04 [diff] |
Merge change I735f4553 into eclair-mr2 * changes: resolved conflicts for merge of ae0cf6dc to eclair-mr2