tree fb161d0cf0622a2ac12bc5c232eac61934ee4c8f
parent 46021d0a18fc8cee198714c1c939be79ad8d440e
parent dd50edcbe71397ca3be0d2d0b782618921cf859f
author Evgenii Stepanov <eugenis@google.com> 1432922926 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432922926 +0000

am dd50edcb: Merge "Fix ODR issues in ART."

* commit 'dd50edcbe71397ca3be0d2d0b782618921cf859f':
  Fix ODR issues in ART.