| commit | dba0f1677e21ada1b9586e81205ad82ea493b930 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 14:20:47 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 14:20:47 2010 -0700 |
| tree | 85f48fd8e5576feecb15939f81e6af4bbe1942fc | |
| parent | 2e469b827d404c3f21c9fb1f1ab2a92c61df699e [diff] | |
| parent | a2239f61d28af52c6024d63487f11b13a20aa0e7 [diff] |
resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d