tree d593247302cc6c5e2bec71862b314434904c8ea9
parent 21b7050eacf0712195589df0a369e24871f2fca4
parent 58fcd13c1646ee303f844484935a827b4380b08c
author Stephen Hines <srhines@google.com> 1347588558 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347588558 -0700

am 58fcd13c: Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev

* commit '58fcd13c1646ee303f844484935a827b4380b08c':
  Fix up slang for merge through LLVM r163557.