| commit | f863896d52c6006e79e9f5fcc406bc12f2239fae | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 16:21:31 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 16:21:31 2010 -0800 |
| tree | d139737f456612500eda893c97e8576faee814f5 | |
| parent | 4d43367eda842f16a1d36233dc64514fa2d967dd [diff] | |
| parent | 1351c0e48869cf2b0f72cb133c2f74ca15f6ce04 [diff] |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf