tree 698d8321b60e81f50a799ba1c88298bfce5963e9
parent 97eab22c3f8b6943fc2d7bb25cdc0110f218aa53
parent 151a024765c5b618829ebb3b7b3131d09855ce98
author Josh Gao <jmgao@google.com> 1491522798 +0000
committer android-build-merger <android-build-merger@google.com> 1491522798 +0000

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

Change-Id: If3d55f3c5237083f7e2130487abb502abcfb14ce