OSDN Git Service

Merge "Fix doFadingAnimationLocked in sanitized builds." am: 05284b6c6a am: b327eb682e
authorIvan Lozano <ivanlozano@google.com>
Tue, 16 Jan 2018 22:00:55 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 22:00:55 +0000 (22:00 +0000)
commit5d00273328199057bd13d10f423dde8a4ca0a400
treefff0c5a921d31696c82d63940369b760bba852b2
parent0c69a8eef9fa5df90a8c3f092215d6887e60022a
parentf74c76e2dfcaa481a734daa74d62c5277e27f3b5
Merge "Fix doFadingAnimationLocked in sanitized builds." am: 05284b6c6a am: b327eb682e
am: f74c76e2df  -s ours

Change-Id: I3fe3873a2f05db3ab0e916c90ceb1e280bcd0409