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

Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp

* commit 'f461930872beb4362998642c115691bdd2e94617':
  fix [2835280] Add support for cancelling buffers to ANativeWindow