tree cb315d9cd38584e800a2bea4be47b01791af1278
parent fc1052715b54b3e0e1cf16a4972c1ccee77ca62e
parent 6006e2ce92fd86fdf028cd7b3afe972815b0e0f3
author Mathieu Chartier <mathieuc@google.com> 1454545604 +0000
committer android-build-merger <android-build-merger@google.com> 1454545604 +0000

Merge "Strip image-format arg in dex2oat"
am: 6006e2ce92

* commit '6006e2ce92fd86fdf028cd7b3afe972815b0e0f3':
  Strip image-format arg in dex2oat