am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of...
am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '043a3cdd':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)