tree ef71a4183a6cce8346a8930203b126f3a62f2765
parent 53b7712271589b17821ca2768b97a2e7833a116e
parent a2ade148e34988b19b0e3f5d166c9f71be6e7f47
author Nicolas Geoffray <ngeoffray@google.com> 1450395531 +0000
committer android-build-merger <android-build-merger@google.com> 1450395531 +0000

Merge "Tweak inlining heuristics." am: ff6ab45547
am: a2ade148e3

* commit 'a2ade148e34988b19b0e3f5d166c9f71be6e7f47':
  Tweak inlining heuristics.