tree ebd4d739215332e242fa5cba88f95c0791873d42
parent cfd52660f79d623a6e9de00e60ddac8bb1aa032e
parent 58d487f0f12f272cc344a8ea3e31e393ebbcd092
author Stephen Hines <srhines@google.com> 1440672617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672617 +0000

am 58d487f0: (-s ours) am 704c0b2a: am 16b9a4f1: Merge "llvm-rs-as: Wrap bitcode with the RS bitcode wrapper."

* commit '58d487f0f12f272cc344a8ea3e31e393ebbcd092':