commit | 6bbe40abf9db417f35a8f6fb2ca1b296ad7e4efc | [log] [tgz] |
---|---|---|
author | Rob Carr <racarr@google.com> | Tue Apr 18 20:24:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 20:24:21 2017 +0000 |
tree | 04a346fadad593cf0a198998ccbc23b424358f47 | |
parent | 151eaf3a7c2336bcf1bce263b25fe6fea1e39da8 [diff] | |
parent | 08260b881a6959db7144ea77b05aaa6b50e85026 [diff] |
Merge "SurfaceFlinger: Inherit non-transform Scaling from parent." into oc-dev am: 08260b881a Change-Id: Ie65a136803007c3d8cde8e909f913399764de557