tree 1ceac241c18cc3a92494b0e20041a2fb05404bae
parent ea957eb6d2921313f7e7d20336122ca6f2023f3f
parent ce680bfd065a9c6d1d5288d65cb652ca47c464da
author Doris Liu <tianliu@google.com> 1492818389 +0000
committer android-build-merger <android-build-merger@google.com> 1492818389 +0000

Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am: 4d72cd9550
am: ce680bfd06

Change-Id: I07401f285ae1abe18bf3932bf79618759f24c9bd