tree 674840ed0c92c08a0cf8ac7d3ea0a36de13e10bf
parent 8ff751b078a66ec3836f05e34eb72f9209945b78
parent 225bee50ffd091eae3480ab6b7b72c7232bb5f00
author Andreas Gampe <agampe@google.com> 1439237286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439237286 +0000

am 225bee50: am 32a67404: Merge "ART: Fix reg_type_test"

* commit '225bee50ffd091eae3480ab6b7b72c7232bb5f00':
  ART: Fix reg_type_test