tree 7b021b0222b98c0cdc2c7d74e8442921fbf3fcae
parent 6dff598b7693016027fce9cc939cd53580ed6427
parent 524694c49491eb2e584fef25a5cccd2f103d5545
author Stephen Hines <srhines@google.com> 1346909613 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346909613 -0700

am 524694c4: am 529e07e9: Merge "Fix up slang for LLVM upstream merge to r162314." into jb-mr1-dev

* commit '524694c49491eb2e584fef25a5cccd2f103d5545':
  Fix up slang for LLVM upstream merge to r162314.