tree 3794a2d80c874bd87f07fc0d33c5ec8792f9acb6
parent 66ee934c917686cf6ca9caf57c59b038cb212c17
parent 88cfa0324724c7e90bfed3aaa61c27ca0926860b
author Ying Wang <wangying@google.com> 1410855747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410855747 +0000

am 88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."

* commit '88cfa0324724c7e90bfed3aaa61c27ca0926860b':
  Enable multilib odex only if TARGET_2ND_ARCH is defined.