tree 5a6b8fb8ace5cb6eb9174765369e58410c8c3d9d
parent e505c666fa2e4e563c7545ac2af4cd5136fc263c
parent 9e7e124326cf4c0a20709f313d290fcfecc4f3de
author Stephen Hines <srhines@google.com> 1390356428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390356428 +0000

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

* commit '9e7e124326cf4c0a20709f313d290fcfecc4f3de':
  cpu_ref: fix c++11 narrowing violations