tree d3acacbf1cbf8e0c23aef7a1f5dbd4732f9fb155
parent 22c13e1205af06724725f182bd737a9cac4118da
parent bf14c651080c31ae923ae1a75dbb82ace5adeee1
author Nicolas Geoffray <ngeoffray@google.com> 1450195537 +0000
committer android-build-merger <android-build-merger@google.com> 1450195537 +0000

Merge "Fix --inline-max-code-units option."
am: bf14c65108

* commit 'bf14c651080c31ae923ae1a75dbb82ace5adeee1':
  Fix --inline-max-code-units option.