tree eafa376697b76100636cccae4135cefcd081bd63
parent 5a29033db263dee0e9b6df42cf8995274279ca1c
parent 719518bf4bc031e26954d07e30fee2cca5683fe5
author Christopher Ferris <cferris@google.com> 1362711470 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362711470 -0800

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

* commit '719518bf4bc031e26954d07e30fee2cca5683fe5':
  Adding TARGET_CPU_VARIANT to config file.