| commit | 172abbb311458d94ae06c433d49d5dea26013458 | [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 | 9b206f1df497facef94e01a850cc3c1ac8f12f8b | |
| parent | 0b3b01a6098ec4d1353d7ade49360ffe4e1a3f88 [diff] | |
| parent | 5a03d372952c83bc4e9cb7076aae9a1d5924c8fa [diff] |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472