tree 753896697edd5e417813fd6a109789f0154cb397
parent 87245037687c830796d713f66da8d5cc3fcca019
parent d708a28cf8e5efcdd3ab76ce8276fcb418a8cb41
author Evgenii Stepanov <eugenis@google.com> 1432923873 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432923873 +0000

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

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