am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to...
am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '2588648b':
Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE