OSDN Git Service

am 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Thu, 31 Oct 2013 06:23:45 +0000 (23:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 31 Oct 2013 06:23:45 +0000 (23:23 -0700)
* commit '18f94b1e6c489f0d68c694a197aae898c68124bb':
  fix corruption in Vector<> when malloc falied


Trivial merge