| commit | e0cb0fd3f5c9626d90ea6907e63530d8e05067f9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 15:24:06 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 15:24:06 2010 -0700 |
| tree | f0dcf64c48c889735846a0cb755735b739441f4d | |
| parent | 0dda5a191df021a13c91d42109d55f4434b2c5da [diff] | |
| parent | ba3ed0c7d0be642ca84b71a1a53fa1cfe6df4409 [diff] |
resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb