tree 1b3297bcd90127b5f0cfb18feb1da8ef580cccc4
parent 853c565de9af76aeff19fd423e3e19bf6b6c2472
parent 632d511a250c124794bdaff3fdf323753542dd4e
author Paul Duffin <paulduffin@google.com> 1562951769 -0700
committer android-build-merger <android-build-merger@google.com> 1562951769 -0700

Merge "Convert preload2 from .mk to .bp" am: 90453ff9d9
am: 632d511a25

Change-Id: I52322592a5ec00038dd00ca9df0d38324c770e2e