tree b73947a60412c38c53f2776d9844314b5e06fc3c
parent 9328c58e328cb978e98c13f4cd50fb9243b44d43
parent 6ea0406747f76d909701053722fd44bc673826c3
author niuchl <niuchl@google.com> 1441389388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441389388 +0000

am 6ea04067: Merge "Revert "Update TARGET_ARCH guards to allow x86.""

* commit '6ea0406747f76d909701053722fd44bc673826c3':
  Revert "Update TARGET_ARCH guards to allow x86."