| commit | 6a691b3ed872ed42d83ef52a0f975cfc5b3c638a | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Thu Jan 27 21:46:19 2011 -0800 |
| committer | Raphael <raphael@google.com> | Thu Jan 27 21:46:19 2011 -0800 |
| tree | 2931dfc4766003e31e853184b71edf9945d6f1a4 | |
| parent | b35e113cef040b9e8c8907341a2f94e420f7d108 [diff] | |
| parent | 1adaa57108517bc4ea45c9fe4881390f056354d8 [diff] |
resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68