tree f550ea925e5b3e9350329a0df1c6ec0d5a341a95
parent e36add0bc8d4570d4bc1e1aa0091b24f61da3f03
parent 15bc1ab706c531f9c5fd0ef94a0924936382e923
author Igor Murashkin <iam@google.com> 1483561430 +0000
committer android-build-merger <android-build-merger@google.com> 1483561430 +0000

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

Change-Id: I3e7dae17b299752ddad5bf8469c652dd26735271