| commit | e2831a181f14dd6ca0e601a4c3cdc313a58faaae | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Dec 10 17:05:43 2014 -0800 |
| committer | Chris Craik <ccraik@google.com> | Wed Dec 10 17:05:43 2014 -0800 |
| tree | 62a964b423bcccd87cf9f25b732dcaf7f0b4956c | |
| parent | 88daefb9485d0606ae0554514ae149bc97c7b4b7 [diff] | |
| parent | 5369b76963a344d08fda4532227a6f0da28fd23a [diff] |
resolved conflicts for merge of 5369b769 to master Change-Id: Iccb2ce948321534e05d67e64dc40a38332adb1a7