tree bbb9349fc10350c1f8d2eb29466661a2bb83964b
parent ade61afd29a70322eaf630c9aaa93c9c150a9355
parent 79ce31073a60e6d0a4ddc862e1e182b4d165c553
author Tao Bao <tbao@google.com> 1485843623 +0000
committer android-build-merger <android-build-merger@google.com> 1485843623 +0000

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

Change-Id: I7f8d0553853ed01acd9973a80c710b3eab1f370b