am ceaf8ac3: am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb

* commit 'ceaf8ac31c0ee131f5c7865feb227f60def729df':
  Fix error reporting in Surface::cancelBuffer()
tree: 795c2a6df670f5ae61f4389c23d5a377316f1794
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE