tree 04df562c8585453ec60106fd1fd480055583cd76
parent 54cfce1e60e14b791f7dc04ebb45cc3976f165db
parent 57222d44bc4b02e258eb3958b5ad18ff36b28978
author Nicolas Geoffray <ngeoffray@google.com> 1450196306 -0800
committer android-build-merger <android-build-merger@google.com> 1450196306 -0800

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

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