| commit | 026231284c44ca8cf789e0d5045c5ae6a91d7766 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 14:20:47 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 14:20:47 2010 -0700 |
| tree | f72b76b983a362258fa2f84ab759190f52c19c09 | |
| parent | 360ab1dfb4ca9e33a604a5e2339c87291880faff [diff] | |
| parent | 1ffd753ee0cc373965dcc0fe6ef9affdd15035a1 [diff] |
resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d