| commit | 8fcb0044238afb08598ac30ce299758f906de9f0 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Mon Oct 25 16:39:11 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 25 16:39:12 2010 -0700 |
| tree | 4ca64e6705104fcfb33576e9aa815f1a29a55c17 | |
| parent | a9c0f059d359265513ca5fcfdf86bdf11205ab05 [diff] | |
| parent | 172abbb311458d94ae06c433d49d5dea26013458 [diff] |
Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp