tree 698d8321b60e81f50a799ba1c88298bfce5963e9
parent 8adb2815291cf1eed5931228f005554981f09c1e
parent 99a532a36749c0836bda622bfcb2ee23c4ba1ba3
author Josh Gao <jmgao@google.com> 1491522588 +0000
committer android-build-merger <android-build-merger@google.com> 1491522588 +0000

Merge "versioner: fix LLVM assertion failure." am: a07033e0dc
am: 99a532a367

Change-Id: If74540b66b7c40a20c7b9816850240ae0705472a