tree bbb9349fc10350c1f8d2eb29466661a2bb83964b
parent 9518d34c0f93bac39e0c7ec86b2fb19b81087867
parent 2684259c3458ca7a986f2365d3f19b21f5afe26e
author Tao Bao <tbao@google.com> 1485843473 +0000
committer android-build-merger <android-build-merger@google.com> 1485843473 +0000

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

Change-Id: I94fa5b8e3d0faad7e16a8f696f9b96bb055f2fc6