| commit | a65f76962f475c9c187dd63dca36e59eff84dcca | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Tue Nov 23 15:36:17 2010 -0800 |
| committer | Raphael <raphael@google.com> | Tue Nov 23 15:36:17 2010 -0800 |
| tree | b58c635a27b34385549db97f4bb2b0a39aa9bf32 | |
| parent | 0aa3856227eb3b9f63419b6e91ac80f25f0dc104 [diff] | |
| parent | f0f624f37b49cf9065c26e767f89a044e3e2e085 [diff] |
resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6