tree 97f8e7a520a1ccae5a4e97e71a50a2a131db0ce1
parent 287c34497550ff3f27a5fa3aa15c0049081056d3
parent 1a082f3061c2a444ac6602f321aa334589167f07
author Mathias Agopian <mathias@google.com> 1296000288 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296000288 -0800

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

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