tree ebd4d739215332e242fa5cba88f95c0791873d42
parent aa0539ee8696b3d373029f6b93581d827def0089
parent f7f5bf4d5633ef92f42a1ccd95e3dd57756c67c5
author Stephen Hines <srhines@google.com> 1440672614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672614 +0000

am f7f5bf4d: (-s ours) am 44f268c9: am 01fc7779: Merge "Update llvm-rs-cc version to 23 for M."

* commit 'f7f5bf4d5633ef92f42a1ccd95e3dd57756c67c5':