| commit | eaea127a8bc91882b904763a226a92835bf9e8d9 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 11:23:51 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 04 11:23:51 2011 -0700 |
| tree | bcc9944cad769296d6d1e7f1929cc813c29eaba3 | |
| parent | c0c45b0dd0bddb41a5c14c92028f60e7f958365c [diff] | |
| parent | 544de0b31f705a98ecaf7700e05214c1adfc822e [diff] |
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp