tree 515386cefee0425c38e3bf67f9ad59bfec45799c
parent a674109017f4c3a1a28c6593db8ffd74c59ea7c1
parent c3d4b175322a26cf66115c9807fb87c08ce3b9f7
author Android Build Merger (Role) <android-build-merger@google.com> 1474931668 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474931672 +0000

Merge "Merge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap" into nyc-dev am: 0b498d6139" into nyc-dev-plus-aosp