commit | 3a0493d8bfb31d92961177c2f8d3c8ac5b39fe23 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Thu Feb 01 19:20:16 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 01 19:20:16 2018 +0000 |
tree | 45c22aa065247825c7e7013bd7073278fd4f790c | |
parent | 33f6d6fde5cecb695d478b978a430e4e574d8c17 [diff] | |
parent | 773a9e8396a3e88b3534d42fc7210161c8f83c61 [diff] |
Merge "dex2oat: Accept .dm files." am: 21dca73964 am: 773a9e8396 Change-Id: If5b421291a11c4a79114878ea30a9a83c0f98995