summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2013-10-30 23:23:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-10-30 23:23:45 -0700
commit7d2ce753a2d04f99963a8011f713ad909466a51f (patch)
tree8a5dfd0597608392d244ebead9d5949439d37160 /libs/gui/ConsumerBase.cpp
parent8252bf752a2a6130355e2ccea7b03b42279a111b (diff)
parent18f94b1e6c489f0d68c694a197aae898c68124bb (diff)
am 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
* commit '18f94b1e6c489f0d68c694a197aae898c68124bb': fix corruption in Vector<> when malloc falied
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions