tree deb21387b6be8939b1495dd6ce16dfeb83520faa
parent 36482247ea66e2bbc7bc828bc19abf8286a9ad0d
parent d5f3bd46a1a9dd4b60a460ceffb40bc3bf8e0fb7
author Todd Kennedy <toddke@google.com> 1495136712 +0000
committer android-build-merger <android-build-merger@google.com> 1495136712 +0000

Merge "don't dex when installing an instant app" into oc-dev
am: d5f3bd46a1

Change-Id: Ia27a62acce14f8dbce07ceef942f0059ed8875cc