tree 3c7fdafa0ae36b02a24bdfa4deee4516082084ef
parent 53a20e5434ca973ef06fab5a93e85a08b5e0efa1
parent 3941c44f6156a13224183b74deb3bc4d5f5a8895
author Andrew Hsieh <andrewhsieh@google.com> 1410809032 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410809032 +0000

am 3941c44f: Merge "Add support for x86 to hello-neon sample"

* commit '3941c44f6156a13224183b74deb3bc4d5f5a8895':
  Add support for x86 to hello-neon sample