tree 9cca811f6070383d4b9ce7288740a71f38d4c6d3
parent 340b516583724a8532c404eabc7b8c1d9cff2e89
parent 7b344bc913ba492e8cbfc1c047bb39e256a323cf
author Victor Hsieh <victorhsieh@google.com> 1548826674 -0800
committer android-build-merger <android-build-merger@google.com> 1548826674 -0800

Merge "Rename preferCodeIntegrity to useEmbeddedDex" am: 05f9055505
am: 7b344bc913

Change-Id: I124c8d5ebf13b51b25a98470cbe0cba074172879