tree 13b9c170433f70f846520d58b18f10104d76afb4
parent 0f6e8e00bd34b783e66fbeea9a571c7a23326261
parent 71b1a6d013347f6b4d229c0072856da3ac1cd1de
author Christopher Ferris <cferris@google.com> 1362711329 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362711329 -0800

am 71b1a6d0: Merge "Adding TARGET_CPU_VARIANT to config file."

* commit '71b1a6d013347f6b4d229c0072856da3ac1cd1de':
  Adding TARGET_CPU_VARIANT to config file.