tree cadf0c6fa12808dc3b2850f82455514a11bed90c
parent 598b2497b363a8189c0c351c363b6feacf138ba0
parent f2bcd619a1f928f796c013301d92ff683cf181c6
author Nicolas Geoffray <ngeoffray@google.com> 1550588010 -0800
committer android-build-merger <android-build-merger@google.com> 1550588010 -0800

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

Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d