am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread

Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'

* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
tree: 0675113ab695ef0c44f8d2229670719df448f0f0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/