am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
  Turn another assertion into a runtime error. Damn you surfaces.
tree: ac6f62957595f7a70edcbea326f5aa614fd9138e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/