tree b2d50211d889e6946dd4669058c9999ac6538e35
parent f7b6b5d956f96458567eae519a926a6f51b077c0
parent 431aff1385e29267f8cacbbc96f761e538eed2e6
author Android Build Merger (Role) <android-build-merger@google.com> 1465332599 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465332600 +0000

Merge "Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am: c3da482bb8 am: 34703b94e1" into nyc-mr1-dev-plus-aosp