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