OSDN Git Service

Merge "ART: Fix ignoring duplicate fields."
authorVladimir Marko <vmarko@google.com>
Wed, 16 Mar 2016 10:04:21 +0000 (10:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Mar 2016 10:04:21 +0000 (10:04 +0000)
commit9506bb186f4186001a4a7ff4fb3755fe40c2407a
tree5310d144d152d1e33002863fcd4db056073b1f60
parent9136bb20ce7bb8bdd283177390483fb47d0c669c
parentd9ebad9b52605ed785222a86c84e58fa7cb66686
Merge "ART: Fix ignoring duplicate fields."
am: d9ebad9

* commit 'd9ebad9b52605ed785222a86c84e58fa7cb66686':
  ART: Fix ignoring duplicate fields.
runtime/class_linker.cc