tree b23ba9623c59e994f1c613c8d5b16730df7bc2ed
parent 82335c87c1a6295c6de44f0b203b66e4020f51d6
parent 18b86b97b83e7d254125723363f170bc6f8d391e
author Ying Wang <wangying@android.com> 1384405337 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384405337 -0800

am 18b86b97: am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"

* commit '18b86b97b83e7d254125723363f170bc6f8d391e':
  Cleanup x86 and x86_64 flags