tree fd57535ee9d6a9296bd033f640b7d7a8cce2d83c
parent 330ad0fcdd197799d6685e079450ccae42921e05
parent 372e3beecafaaac5e2c063eb68beca9ab3684056
author Mathieu Chartier <mathieuc@google.com> 1437677851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437677851 +0000

am 372e3bee: am f64914d7: Merge "Move to newer clang annotations"

* commit '372e3beecafaaac5e2c063eb68beca9ab3684056':
  Move to newer clang annotations