tree de42e341e7d8a33096e887e844748000985fed8b
parent 87e11dab8ca6b1ba0765cf39cc4041d86303b200
parent 55c0f49cf185a9457acd32d6e5f3a79900983702
author Nicolas Geoffray <ngeoffray@google.com> 1450395547 +0000
committer android-build-merger <android-build-merger@google.com> 1450395547 +0000

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

* commit '55c0f49cf185a9457acd32d6e5f3a79900983702':
  Revert "Tweak inlining heuristics."