tree 910110e1e8abaa538f6909439504355d79c92c5a
parent e6480ed7d3d9c0526cfb418f36a3377a77646077
parent 6d6453076b2bef6d34022da35bb80a9209db3525
author Colin Cross <ccross@android.com> 1481249222 +0000
committer android-build-merger <android-build-merger@google.com> 1481249222 +0000

Merge "Support *Options.inc in llvm tblgen" am: f01c9a63a2 am: 004f0641e6
am: 6d6453076b

Change-Id: I25aacbfd34e9afea7a4373e30772d5c68bda542f