| commit | dd0afa03f20c3aab7a4337b8a72a4b6214d3446f | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Jun 12 11:34:48 2014 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Thu Jun 12 11:34:48 2014 -0700 |
| tree | 0bc3920f368db4e6bc80b2c392117d93f1b3ee94 | |
| parent | 04d0f5f3ab844b1d6f14ff67398384faff54ed5b [diff] | |
| parent | 0c651756f03382d391cec8611596d865b79a565c [diff] |
resolved conflicts for merge of 0c651756 to master Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d