tree c7300752cf27bd6c1c377397c03ec9b9ca3b5ed7
parent 42bd2faa45a5b50c0944bc6b30cf56d26c9dacc8
parent 4cc3c4d3f4b6625cccbc83b4bd014f8129b103a4
author Stephen Hines <srhines@google.com> 1390355695 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390355695 -0800

am 4cc3c4d3: Merge "cpu_ref: fix c++11 narrowing violations"

* commit '4cc3c4d3f4b6625cccbc83b4bd014f8129b103a4':
  cpu_ref: fix c++11 narrowing violations