am 18f94b1e: resolved conflicts for merge of 51b27e82
to klp-dev-plus-aosp
* commit '18f94b1e6c489f0d68c694a197aae898c68124bb': fix corruption in Vector<> when malloc falied
This commit is contained in:
commit
7d2ce753a2