OSDN Git Service

am 0658783a: resolved conflicts for merge of 85e9888d to mnc-dev-plus-aosp
authorVladimir Marko <vmarko@google.com>
Thu, 25 Jun 2015 16:03:23 +0000 (16:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 16:03:23 +0000 (16:03 +0000)
commitf0a11a050d633a34714b334340aa220c1b25e926
tree7042377633ffb0a9d2ed4500415275b3f8a167fa
parent5571b26821e9d3b64ed382b2ea3c50f294a5a1e6
parent0658783a606fb9a5d4505f257ec10a223e946092
am 0658783a: resolved conflicts for merge of 85e9888d to mnc-dev-plus-aosp

* commit '0658783a606fb9a5d4505f257ec10a223e946092':
  Hard-fail get-/put-object to a non-reference field.