am e48ede2b: am 10a16006: am 785768a9: Merge change Id443ba45 into eclair

Merge commit 'e48ede2bb49244400be95f5f4e9967ab77cfcd8b'

* commit 'e48ede2bb49244400be95f5f4e9967ab77cfcd8b':
  Prevent transparent region from getting out of sync with Surface Flinger