tree 4f3177cc6e90a51e9ae018924e73d8b3adf3d993
parent 46d69e9914ad359b63637f9734cf9e85e04af1a9
parent c5a563447a68c30dd998b7cd6f8f8c30693edc37
author Ying Wang <wangying@google.com> 1395346718 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395346718 +0000

am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT