tree 1b97e42e4ea9d8a9f663204862387443fef57b40
parent 974a6e80c63f9d17f98cba9fcbd3ddb918fe67a3
parent 78997a2af561f1e940cd047241a17de13957fb81
author Tao Bao <tbao@google.com> 1518758936 +0000
committer android-build-merger <android-build-merger@google.com> 1518758936 +0000

Merge "recovery: Porting screensave mode for new platform." am: 15e376d792 am: 470b4fef7f
am: 78997a2af5

Change-Id: Ife60145d34a88c8e474931966f456804e39a317c