Merge "Change behavior of $noinline$ to now force not inlining."

author Nicolas Geoffray <ngeoffray@google.com>

Wed, 15 Feb 2017 09:06:26 +0000 (09:06 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 15 Feb 2017 09:06:28 +0000 (09:06 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Wed, 15 Feb 2017 09:06:26 +0000 (09:06 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 15 Feb 2017 09:06:28 +0000 (09:06 +0000)
diff --cc compiler/optimizing/inliner.cc
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Wed, 15 Feb 2017 09:06:26 +0000 (09:06 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 15 Feb 2017 09:06:28 +0000 (09:06 +0000)