Merge pull request #7515 from BruceForstall/FixMerge
authorBruce Forstall <brucefo@microsoft.com>
Fri, 7 Oct 2016 16:29:02 +0000 (09:29 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2016 16:29:02 +0000 (09:29 -0700)
commitc3781e152ea38f0468777adeea76a5da3d100b44
tree60687e72d15656d6b7f9eaa951a3c72f1a723744
parentb51786d7cccaaa303b322baa8b452df664d2b033
parent4efebd6d8d85e20cd4f648737ee9c78ebc679f76
Merge pull request #7515 from BruceForstall/FixMerge

Fix bad merge