OSDN Git Service

am f3fc5a6d: resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp
authorMingyao Yang <mingyao@google.com>
Wed, 30 Jul 2014 13:04:08 +0000 (13:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Jul 2014 13:04:08 +0000 (13:04 +0000)
commitf33784e3a386a28e0e543e4b1c83e5baebb8a3c2
treeacb71cf90f57a28176ff5cc050cb55a30ee5023a
parentb91ce0a6889b29c007521dd39c1f1bc16714af1a
parentf3fc5a6d29cf7cadc0ac1bd4567042aac27ec543
am f3fc5a6d: resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp

* commit 'f3fc5a6d29cf7cadc0ac1bd4567042aac27ec543':
  Set vtable in class object to null after linking.