commit | 3a58eae0521d4a0ce85730ace4b897fe87cca18f | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Fri Sep 14 10:29:23 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 14 10:29:23 2012 -0700 |
tree | d593247302cc6c5e2bec71862b314434904c8ea9 | |
parent | e6e9db9a5b9f1c299d5f4c8cdddea356748809b8 [diff] | |
parent | 3754bfd4d645a501c93ca1713eb27bc70121906a [diff] |
am 3754bfd4: am 58fcd13c: Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev * commit '3754bfd4d645a501c93ca1713eb27bc70121906a': Fix up slang for merge through LLVM r163557.