From: Jesse Hall <jessehall@google.com>
Date: Thu, 31 Oct 2013 06:23:45 +0000 (-0700)
Subject: am 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~1018
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d2ce753a2d04f99963a8011f713ad909466a51f;p=android-x86%2Fframeworks-native.git

am 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp

* commit '18f94b1e6c489f0d68c694a197aae898c68124bb':
  fix corruption in Vector<> when malloc falied
---

7d2ce753a2d04f99963a8011f713ad909466a51f