tree 58998e44e3978df2d3946fb5ceb2f1554c35aa6e
parent 5532ceb9682971a24dd4377a54f2dc732d6eb537
parent 8d254fd40df498a21ca540cb355ee8c6a9250ac0
author Tim Murray <timmurray@google.com> 1405464648 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405464648 +0000

am 8d254fd4: Add override to force the CPU variant.

* commit '8d254fd40df498a21ca540cb355ee8c6a9250ac0':
  Add override to force the CPU variant.