| commit | 91afae6c039d06df83d708834c96d47858406e2a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 12:42:18 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 12:42:18 2012 -0700 |
| tree | 199789c202d963438d19e43340c269baa9065927 | |
| parent | baa97012143a8601aff04428a179446d8182a4a4 [diff] | |
| parent | dd14acc3f665e83ee5da1cd300606c14a5513ae8 [diff] |
resolved conflicts for merge of dd14acc3 to jb-mr1-dev Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f