tree c5a7099c24ab7ac7782e7bbf64f26c75b2350216
parent 84f8ba632953b08fd9d73c1e152cef9c9652c961
parent 8e006762917a2ee193e12c74ba24e69a5e1b9144
author Nicolas Geoffray <ngeoffray@google.com> 1450366587 +0000
committer android-build-merger <android-build-merger@google.com> 1450366587 +0000

Merge "Revert "Tweak inlining heuristics.""
am: 8e00676291

* commit '8e006762917a2ee193e12c74ba24e69a5e1b9144':
  Revert "Tweak inlining heuristics."