tree fa8fca1c6e65770b573eb26e7646aea78a310f6c
parent 1efca130c98eea61e165b0db52c29caa04f416a5
parent 3de875019e017a26d4960ea6e70a9949d0f4dd22
author Shubham Ajmera <shubhamajmera@google.com> 1505201676 +0000
committer android-build-merger <android-build-merger@google.com> 1505201676 +0000

Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
am: 3de875019e

Change-Id: I570bcf56e7b971b452007eb8db1ce6f13066ce05