tree 3c7b943a0c32809efd8918db341bf09e58db4553
parent 0d5e69bb7ac031413104d0ee82f799bcda128777
parent 76d54b4dea5410d0459c8b596a86272b07fe1f18
author Lucas Dupin <dupin@google.com> 1521620612 +0000
committer android-build-merger <android-build-merger@google.com> 1521620612 +0000

Merge "Merge "Screen off animation" into pi-dev am: 6e7e028b62" into pi-dev-plus-aosp
am: 76d54b4dea

Change-Id: I81c250aa88f1f6c36d6933010eff90ae5584b7af