tree b8cfe383ee5911cf0375e6c4cdcaa69534b9bb91
parent b649cad15f7f5ab2b016887eb825cd7df8557f1b
parent 7e3b1c00c6c17891d0c3b55fa2468d4946d73c26
author Tao Bao <tbao@google.com> 1498963906 +0000
committer android-build-merger <android-build-merger@google.com> 1498963906 +0000

Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa
am: 7e3b1c00c6

Change-Id: I8892407f036aa2dd1a8e90068274362648cc6cc0