tree f550ea925e5b3e9350329a0df1c6ec0d5a341a95
parent 3a32e9b2526bd2c5edaea61eab316b0271975677
parent 9809f45fa7f8f0fbff56c898ea253cc8f8fde2b8
author Igor Murashkin <iam@google.com> 1483560888 +0000
committer android-build-merger <android-build-merger@google.com> 1483560888 +0000

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

Change-Id: I644f83ea27d82fa67be351f4d2423fea96723e9c