commit | 15bc1ab706c531f9c5fd0ef94a0924936382e923 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Wed Jan 04 20:20:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 04 20:20:50 2017 +0000 |
tree | f550ea925e5b3e9350329a0df1c6ec0d5a341a95 | |
parent | 6049f06e88d3c4dba66b2ceb860e4ac9af5d28f9 [diff] | |
parent | 30754395332909566d31ef0ce16c1adfcd8bc66f [diff] |
Merge "dalvik: Accept custom --vm to a degree" am: 9809f45fa7 am: 003056143e am: 3075439533 Change-Id: Iff3c1991d733a2314bd961a3ec89c0631227c217