tree 3e044c5024f4103caa46f66166eece10c058dd18
parent 2781919fe40ff5bcdce4571c0735e7a80fcb0afd
parent 1689f351bfc681d605302150791d0acac745fea2
author Pirama Arumuga Nainar <pirama@google.com> 1477503918 +0000
committer android-build-merger <android-build-merger@google.com> 1477503918 +0000

Merge "Fix slang to compile with LLVM r275480"
am: 1689f351bf

Change-Id: I69f07fd5196534fcb7efc9a378557c0a4f546573