tree 3d7bd0e1a3766b6bbcdf73e0e7e1af3c8a2476db
parent f4dc128aa28bc5be2b6fffa7632cb15fe6ef9949
parent c36e3e7fff392495360f3ac2f123f693728a958b
author Chet Haase <chet@google.com> 1497915598 +0000
committer android-build-merger <android-build-merger@google.com> 1497915598 +0000

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am: c36e3e7fff

Change-Id: Ic680329647398f52a0d28633aa209e37556c1e31