| commit | f389f2820c731b2b938a7057cde9dc11d87bcbe3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 05 12:21:50 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 05 12:21:50 2012 -0700 |
| tree | 341afc00da6563ace9d11a6abde2ad05b245dd57 | |
| parent | 5575e97cea2bbaf0f4f1c3445e28cff2759d4f74 [diff] | |
| parent | 7749a1c5eccd9e3d514b58cb04bcf13e0441e7d9 [diff] |
resolved conflicts for merge of 7749a1c5 to jb-mr1-dev Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97