tree 6dda3b246dd20518bcacda740e68c85f47842737
parent 76af8a3c835026673c7720f9ac411a77689cca5f
parent 60a40d9ee5c5ce10df829184a6a14694f2ef8fb8
author Stephen Hines <srhines@google.com> 1417722642 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417722642 +0000

am 60a40d9e: Merge "Update aosp/master Clang for rebase to r222490."

* commit '60a40d9ee5c5ce10df829184a6a14694f2ef8fb8':
  Update aosp/master Clang for rebase to r222490.