tree d61fccb73f54fafd4ea8ed9a4a2aef9227885cd5
parent 93017bb133263a690b8d0e25f8af58383d034cfc
parent 6ceae991fc60ce507029018102a9002d915cbb9b
author Stephen Hines <srhines@google.com> 1440676587 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440676587 +0000

am 6ceae991: (-s ours) am 7c9cf785: Merge "Update clang darwin prebuilt for kernel attribute change."

* commit '6ceae991fc60ce507029018102a9002d915cbb9b':