| commit | 6525fca692c57f9746ab65535d3b2f7ec712113c | [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 | 5a433ac791627f25b15b8f5c9df6665da694eb26 | |
| parent | 5085848ddbadaafa088ed85753156adc2e54554d [diff] | |
| parent | be50507bae350a8dea2a1a865513c31317d4cde9 [diff] |
resolved conflicts for merge of be50507b to gingerbread-plus-aosp Change-Id: Iaa5fb62f7b82b488bca192e7f374c044c7e1e6a7