tree 6958234dbd67da5b91a4c6255c7bc568abaad4d1
parent becdd58df5d01e5c1c48f814beba2a32b9c34162
parent 80e697a297a8846b64e250ed1df1a2ef79da6e11
author Nicolas Geoffray <ngeoffray@google.com> 1550587484 -0800
committer android-build-merger <android-build-merger@google.com> 1550587484 -0800

Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am: 80e697a297

Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a