am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp

Browse Source

Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac'

* commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac':
  frameworks/base/opengl: Add NULL check

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-17 07:46:40 -07:00

committed by Android Git Automerger

parent 64d078425a 1a0b19b324

commit a542f8cd0e

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

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

Diff Content Not Available