| commit | beefded161c7d3c482d68c19cda231cf9bfcbdc3 | [log] [tgz] |
|---|---|---|
| author | Rob Carr <racarr@google.com> | Tue Apr 18 20:35:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 20:35:46 2017 +0000 |
| tree | a9047aef53cbd3e3a77f45a74935030945aa211c | |
| parent | 1378943d05e3ce145343b26bf1f903944b68a985 [diff] | |
| parent | 6bbe40abf9db417f35a8f6fb2ca1b296ad7e4efc [diff] |
Merge "SurfaceFlinger: Inherit non-transform Scaling from parent." into oc-dev am: 08260b881a am: 6bbe40abf9 Change-Id: Ifb0f16bf0484e0f7cfa58a93f1e94dab4f123f04