tree f550ea925e5b3e9350329a0df1c6ec0d5a341a95
parent 6049f06e88d3c4dba66b2ceb860e4ac9af5d28f9
parent 30754395332909566d31ef0ce16c1adfcd8bc66f
author Igor Murashkin <iam@google.com> 1483561250 +0000
committer android-build-merger <android-build-merger@google.com> 1483561250 +0000

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

Change-Id: Iff3c1991d733a2314bd961a3ec89c0631227c217