| commit | e819834ea17380042bf767c457e89dad24ff4aa2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 01 17:21:08 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 01 17:21:08 2012 -0700 |
| tree | 08baab4aca15e5b070ff909f951c4f53f4dae873 | |
| parent | a65846cce3812184074cbbbfe2fa721142f549ac [diff] | |
| parent | 8422277e4c07a3fa77947805a977af321779512b [diff] |
resolved conflicts for merge of 8422277e to master Change-Id: Ic32740bb257916035b23b6e8e88efdbce5da19d6