tree 63adaa850e36e9e67b10c4dc07edac49dd5fb9a1
parent d708a28cf8e5efcdd3ab76ce8276fcb418a8cb41
parent 5788769ddcb9ab33a36fdf4d078f90a4ef022d8d
author Evgeniy Stepanov <eugenis@google.com> 1432949316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432949316 +0000

am 5788769d: Merge "Revert "Fix ODR issues in ART.""

* commit '5788769ddcb9ab33a36fdf4d078f90a4ef022d8d':
  Revert "Fix ODR issues in ART."