| commit | a9741a9232c81eaf59179acef91f5be46c42264e | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Mon Oct 25 15:23:04 2010 -0700 |
| committer | Gloria Wang <gwang@google.com> | Mon Oct 25 16:11:18 2010 -0700 |
| tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec | |
| parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 [diff] | |
| parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e [diff] |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472