| commit | 72de8eb42bce2f22d0e3d22629b66724e2c199ea | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 19:02:41 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 19:02:41 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | 5922b6238b59fd26cbd412b438cb54bba5463581 [diff] | |
| parent | 7b082a34b97024cd18ecfc71776f02b16039d4ec [diff] |
resolved conflicts for merge of 7c08b70c to master Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088