OSDN Git Service

Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
authorVladimir Marko <vmarko@google.com>
Mon, 7 Mar 2016 18:38:59 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Mar 2016 18:38:59 +0000 (18:38 +0000)
am: 810ef37680

* commit '810ef3768021b5fc7b47e663e037e49c46f8c916':
  ART: Fix RegTypeCache::FromUnresolvedMerge().


Trivial merge