| commit | 37229514c56dac0c1e3cef6bc8229232d0c75b96 | [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 | 67f0666dce75aacb210db8c93402662f90a0f5d5 | |
| parent | 27e00544ea08d25e8e9b1b94264205f9d53030fb [diff] | |
| parent | d685c731bf8116f42b980dc31fc7cf29e6ce1fc4 [diff] |
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp