tree 54cb5cb0c48c89363879e9b3e5225e5a34dd4a31
parent 39100cfbc563d1b11ea9ffa81ff0940292d09ec0
parent b71c9d7a6a26070d302b97a95a0fecc0acc73e87
author Ian Rogers <irogers@google.com> 1413128746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413128746 +0000

am b71c9d7a: Merge "Switch to C++11 style [[noreturn]]."

* commit 'b71c9d7a6a26070d302b97a95a0fecc0acc73e87':
  Switch to C++11 style [[noreturn]].