tree 8052160b79d9fa7b18d51a5e42036be22ceb8915
parent 306eb0af2717a27e95637ebfbef141bb7e6fb369
parent 34de74bb9d91534ab7ebbd1f73ee1d96db894b4c
author Stephen Hines <srhines@google.com> 1376383393 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376383393 -0700

am 34de74bb: Merge "Update ART for LLVM merge up to r187914." into klp-dev

* commit '34de74bb9d91534ab7ebbd1f73ee1d96db894b4c':
  Update ART for LLVM merge up to r187914.