am 961ce2af: (-s ours) am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '961ce2afbf82d4b2a9691f1c1cc75a97ce43fe2b': Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
This commit is contained in: