tree dfb0ff1d4ca4cac31057535300d203bb3599c01c
parent a3d1790f483e3fce878085d8ba559a725197c034
parent 59f8ed8df365143e47a5e372715d0014c84eaf21
author Yi Kong <yikong@google.com> 1515444114 +0000
committer android-build-merger <android-build-merger@google.com> 1515444114 +0000

Merge "Revert "Switch to llvm-ar (with crsD flags only)."" am: 8a832c3e6d
am: 59f8ed8df3

Change-Id: I14326de90d9a8d1401c343883faa754d394a1ef4