| commit | 28a989b03bc7be084705cf9d2a29e385917a7edd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 09:01:26 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 09:01:26 2010 -0700 |
| tree | edeb5f4254e4d11b9835b1f00fb7acc8be73e5a4 | |
| parent | b6d5baa317f24be09aa6e74661fbea4d3f0193fd [diff] | |
| parent | ca111553ed8b38a5beb65bedd8aa38dd874e589a [diff] |
resolved conflicts for merge of be50507b to gingerbread-plus-aosp Change-Id: Iaa5fb62f7b82b488bca192e7f374c044c7e1e6a7