| commit | 6638957a2b113772e224008197a2f5daad26d766 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Dec 05 08:23:21 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Dec 05 08:23:21 2012 -0800 |
| tree | 3853d853f06e83cdfea275633b61029b7587682d | |
| parent | b80a9310f8ef0f3a72ec41d054a53e64a5cc839e [diff] | |
| parent | 31e8bcd02ccd82da80040f7f1e124d0521e2901f [diff] |
resolved conflicts for merge of 31e8bcd0 to master Change-Id: Ic907b3ee763198beacfa128346dede0a07f60b63