OSDN Git Service

am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISAB...
authorYing Wang <wangying@google.com>
Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)
* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
  Remove the redundant DISABLE_DEXPREOPT

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge