tree cedb2b997d2067c05a8fb82930d2d5d25dcf4d8a
parent f13fb8446a445cd891dc7be391713ea5248307ac
parent 58b2f1e320a9682871cd4f7e4379c8bf167a2204
author Andrew Hsieh <andrewhsieh@google.com> 1426551235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426551235 +0000

am 58b2f1e3: am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"

* commit '58b2f1e320a9682871cd4f7e4379c8bf167a2204':
  Switch x86 and x86_64 build to use GCC 4.9