| commit | 60c8f863ca84f3e5bb8e78d8001c53511f094d53 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 15:53:16 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 15:53:16 2010 -0700 |
| tree | 0af3cd99e4e85251ae4b32a4967e03b6e5e8716f | |
| parent | 42b871f1bfc116d53d1bff9d7497415494b2e0e0 [diff] | |
| parent | 0fcbdb4147858d40d581d3b034f5150962632943 [diff] |
resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c