tree 9809172b28a6a0806056ccee624e1c4823fcab5f
parent 837e0f1c1bbe428b575beccf7db8c2fe5755f5ef
parent c531b0eea0dd945fe0815944ec534a66887ba150
author Robert Carr <racarr@google.com> 1524610251 -0700
committer android-build-merger <android-build-merger@google.com> 1524610251 -0700

Merge "SurfaceFlinger: Only update client parent if set." into pi-dev
am: c531b0eea0

Change-Id: Ie639712ce8b39b36db0d0b4667c1cc8b79664b5a