tree 78a84416e349f7663fe3927f3f84f7dc82d10cad
parent 101c804a994c35e143f96c9de3d7a0c97d4d6584
parent 88ec27588babd57c9832b2d1fac4eec87469bbd4
author Jorim Jaggi <jjaggi@google.com> 1522266691 +0000
committer android-build-merger <android-build-merger@google.com> 1522266691 +0000

Merge "Revert "Force client composition if we'd use rotator"" into pi-dev
am: 88ec27588b

Change-Id: I9f8a8bd156f4a008c8db40faef6625e66363d64f