am 55fb350e: (-s ours) am 2d665dd3: (-s ours) am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread

* commit '55fb350ef82099c2dd98119735cae10e5eeacfff':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
tree: acba5f60cce6a25d14338f5b7103821f592d65ab
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE