| commit | b530aeb0feab5d371684ee8040b2f11e654ae4df | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Nov 11 16:10:53 2013 -0800 |
| committer | Jeff Brown <jeffbrown@google.com> | Mon Nov 11 16:10:53 2013 -0800 |
| tree | a92ad6aafad718f0a76381a52f61f7cf437355f8 | |
| parent | 7117c0c184b02d703f2a8612b2d253e44999cbfb [diff] | |
| parent | f0b9ee9637db1ebf2ef6f056a10c05ee5400de8b [diff] |
resolved conflicts for merge of f0b9ee96 to master Change-Id: I1b347e895049474e11076c60074dc5918cfe1405