Really revert all changes from r289979. Apparently conflict resolution failed
authorReid Kleckner <rnk@google.com>
Fri, 16 Dec 2016 22:11:28 +0000 (22:11 +0000)
committerReid Kleckner <rnk@google.com>
Fri, 16 Dec 2016 22:11:28 +0000 (22:11 +0000)
commit7972bb7b875b275799b968cb57773aca54ba17fe
tree5a299140cbfcc892e22662b0bc2084cd5a846804
parentb701363188059fe6bfa33f7b4cbbb8babef651fc
Really revert all changes from r289979. Apparently conflict resolution failed

llvm-svn: 289997
clang/include/clang/Basic/OpenCLOptions.h