OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6eacdea 3bac3ad)
am 3bac3ad2: (-s ours) am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b...
authorJason Sams <rjsams@android.com>
Fri, 4 Dec 2009 12:30:31 +0000 (04:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 12:30:31 +0000 (04:30 -0800)
commitcbf6ba8dbbacbce9bf625c11c202637c5bd19b51
tree37f61c7524bb82535ed7e13f9a60e2ef646a2777tree | snapshot
parent6eacdea7afb55f3b5ced7b487197585e24bff2e7commit | diff
parent3bac3ad2dfb11c99ebfc5cd0374b29259686117ecommit | diff
am 3bac3ad2: (-s ours) am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair

Merge commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e'

* commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e':
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.
frameworks/base
About OSDN
Find Software
Develop Software
Help