| commit | cf3592c5bf1c66ba510934fff5eb57ee0b3fd761 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jan 14 18:33:51 2011 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jan 14 18:33:51 2011 -0800 |
| tree | db789ee0027babcee8f5a9a4b090546275365b8f | |
| parent | 3ed11317ce695a413d337c60fde222f30306f092 [diff] | |
| parent | 95304d5488ba465f19cc788f1c7394218c2ea2d1 [diff] |
merge 83fdc69e from gingerbread - do not merge Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680