tree 872eb3acbc1bbc68f118a3dfbc4733b9708bc257
parent 85e14e9c40c5b5df13229a0bdc6d66c1750fd001
parent ae18127ec33b030aeaa4eece6b741784b016e48c
author Evgenii Stepanov <eugenis@google.com> 1435705143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435705143 +0000

am ae18127e: am 7d4fc449: am 8c047830: Merge "Fix ODR issues in ART."

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