tree d372171786eecca83c695f2c53b710e197a51ab7
parent 45ca9f203b5d3630b5dec91896d84b8ac1e7e724
parent 1d17298958b9dd51da13ab81fe1f9a2d39df6bb1
author Tao Bao <tbao@google.com> 1485843774 +0000
committer android-build-merger <android-build-merger@google.com> 1485843774 +0000

Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073a
am: 1d17298958

Change-Id: Ie6692ff538ffb4600e4c912ca0f1dca0355e8cfb