OSDN Git Service

Merge "Added a debug flag to turn on the AOD animation" into pi-dev
authorSelim Cinek <cinek@google.com>
Tue, 15 May 2018 23:17:54 +0000 (16:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 23:17:54 +0000 (16:17 -0700)
am: 8b418b00e3

Change-Id: I551587ccb0ff6aadb6a48d1dfd4280c854814603


Trivial merge