tree 43e400b26ad1fa743924b91adfcbbeb144c3873d
parent aa2343eb886835e6cbb80b6f042f1f8a8a6eb5ca
parent a0c51bbd0ea4c0266b12c9ffa450ccc297160b19
author Mathias Agopian <mathias@google.com> 1296001327 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296001327 -0800

am 9392c41b: (-s ours) am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread

* commit '9392c41b99cb136d6c2a058f6bc3ffb83daf5a46':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)