| commit | 965f960ecacfa7528854d8371ecf309b46fc6ebb | [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 | f7594020d98e622980fc1cff4937b869ecffda56 | |
| parent | 96bdc500104c3e162495a9bfcf90799467e45c3d [diff] | |
| parent | b8791479af814d530a3810d0516ef5628958a8d0 [diff] |
Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp