| commit | b4b878d8c5570c5ad5dfaf6df55a5467b72d35ef | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 14 13:20:28 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 14 13:20:28 2012 -0800 |
| tree | ee5b264b5db81e5d87901df556d1067fd790aa09 | |
| parent | d03dfc274de2847fafa25e7b610afae7750d251b [diff] | |
| parent | b09a8ced97fb01b0f91627982be596e4b119d849 [diff] |
resolved conflicts for merge of b09a8ced to master Change-Id: Icb98996be3d1fb739bd04c2b43cb97f13c88c7a9