tree 17b2f4d5cc98df2febaffcf4402216e740abda28
parent ea0db43e10199fce12d88052864dc6e7c0d12597
parent 39c5d595cd50441e666e5ab0a4af86bdcb46c616
author Vladimir Marko <vmarko@google.com> 1457376045 +0000
committer android-build-merger <android-build-merger@google.com> 1457376045 +0000

Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()." am: 810ef37680
am: 39c5d595cd

* commit '39c5d595cd50441e666e5ab0a4af86bdcb46c616':
  ART: Fix RegTypeCache::FromUnresolvedMerge().