tree 82ee71b08bd23edc9cffd6c6e88a8cef96e2f82f
parent 2fbbd488d62651f0583498b4123ac323e136c756
parent c24d97fafa8f0530b3c5da74228d62e0d9033761
author Tao Bao <tbao@google.com> 1498963786 +0000
committer android-build-merger <android-build-merger@google.com> 1498963786 +0000

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

Change-Id: I6ab605dc914bed4f5104b6fd405d7f5f19a5d863