tree d97c28ff8fc4707a11006ad89b7ac72364d8099c
parent 71dd8103215b64d93217f04c2ceb21a63feff75e
parent 1bba871a63f9c0b0bbeab4e843d783917896973d
author shepshapard <shepshapard@google.com> 1523392348 -0700
committer android-build-merger <android-build-merger@google.com> 1523392348 -0700

Merge "Fix flaking LinearLayoutManagerTest.recycleDuringAnimations()." into pi-preview1-androidx-dev am: 6a6d2efdf9
am: 1bba871a63

Change-Id: I55510e736a58f247bc905d561966a01f203e9a44