| commit | 047f3c71a48d90a2b022bd886bf581add2d68326 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Apr 16 14:18:49 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Wed Apr 16 14:18:49 2014 -0700 |
| tree | 8e3c94eacf5fa0df69ad7ae996e81ec2d7e32835 | |
| parent | 2adb422928d35b34cfd8c52170e0df7ffc681816 [diff] | |
| parent | 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9 [diff] |
resolved conflicts for merge of 3ee9dc58 to master Change-Id: Idd045d01246367b77718210c8b6665110da58ac4