| commit | be24f6f80077cb5aeb4c8ed15d4601c15fb0a6a3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:00:12 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 08 07:32:59 2010 -0700 |
| tree | 51ba91e797e242bd50fa56816efff9a1070db8a3 | |
| parent | 95e743a6c02c9f9844cab95635b4954ecd82e7ff [diff] |
Cheryr-pick of 424de177 "resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp" Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa