tree 62c907baa6f0bbd1273103176a5575bcb6be833f
parent e77717f25d8658b299b517118c7455843395dbe0
parent a042ad06703ac92766f534f6f33ee74f646a1e81
author Victor Hsieh <victorhsieh@google.com> 1548826658 -0800
committer android-build-merger <android-build-merger@google.com> 1548826658 -0800

Merge "Rename preferCodeIntegrity to useEmbeddedDex" am: 423be675eb
am: a042ad0670

Change-Id: I7db9d21a8d8056c3b278e8ee272c97780b8fb194