tree 679df2dbba4a281915d02c37efac9726624b86a3
parent 4b70190ab19d4190f58f569b44200ff682d909e3
parent f10a0c71c1b4d0238ee7cfc9bfab2ed633a4817a
author Selim Cinek <cinek@google.com> 1526428726 -0700
committer android-build-merger <android-build-merger@google.com> 1526428726 -0700

Merge "Added a debug flag to turn on the AOD animation" into pi-dev am: 8b418b00e3
am: f10a0c71c1

Change-Id: I8e0067b68f0c8641f3b4cf4f4929b532777d0430