tree f550ea925e5b3e9350329a0df1c6ec0d5a341a95
parent 0b3be907bfdbc54b11109fd9ae2dc3a4379a8895
parent 003056143e1687aaf6d9b874194e6c77ed02be3f
author Igor Murashkin <iam@google.com> 1483561009 +0000
committer android-build-merger <android-build-merger@google.com> 1483561009 +0000

Merge "dalvik: Accept custom --vm to a degree" am: 9809f45fa7
am: 003056143e

Change-Id: I77c7b3496a94460d7bb1ee621e0411df62a1d75b