OSDN Git Service

am 29eb3d09: am 9b3fb2c3: am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if...
authorIan Rogers <irogers@google.com>
Fri, 18 Apr 2014 23:21:35 +0000 (23:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Apr 2014 23:21:35 +0000 (23:21 +0000)
* commit '29eb3d09c83c71e3178b027f9bcc5b4e4d75ca47':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.

1  2 
core/config.mk

diff --cc core/config.mk
Simple merge