tree 355dd64c138824923208757ef8e5d25fd8291dbb
parent 091fe963435caf952d5fb4768dbc8b71291aec63
parent 4d72cd9550a169d8f14fc3abaa0b5385b5981594
author Doris Liu <tianliu@google.com> 1492816989 +0000
committer android-build-merger <android-build-merger@google.com> 1492816989 +0000

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

Change-Id: I37f564cb4b55572dae2a6cf93e2ba4528ddf8a93