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

Browse Source

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

...

This commit is contained in:

Jesse Hall 2013-10-30 23:23:45 -07:00 committed by Android Git Automerger

parent 8252bf752a 18f94b1e6c

commit 7d2ce753a2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available