| commit | a542f8cd0eac0027df12ef0ec18e7c8d5d81bdf2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 07:46:40 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 17 07:46:40 2010 -0700 |
| tree | c27844c7df5e1d0e5d3c618f92cc0c73eee9ccc8 | |
| parent | 64d078425a5a74c1f12ad1a270cf5d55af648798 [diff] | |
| parent | 1a0b19b324eb6631333dcc51d9b92c3b1ead2eac [diff] |
am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac' * commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac': frameworks/base/opengl: Add NULL check