tree 1c209e0500c8a774f51ce2fa9ac1c4ed34857d5c
parent 155ecba1c9b56ce1b468135e6a591a3fe9258c52
parent e265ecf1d24d6da34beafe2340fa5aadaccc9c7f
author Stephen Hines <srhines@google.com> 1376383531 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376383531 -0700

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

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