tree b4c41b378f11d46e64248a4157f087bb87e82d1e
parent 6e186a155f037f208cc6e734fcde43a2c0c6185a
parent 9d59cecdf99250565a7e68eb81ac2a6dbc7eacd3
author Tianjie Xu <xunchang@google.com> 1544573948 -0800
committer android-build-merger <android-build-merger@google.com> 1544573948 -0800

Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2 am: 608acc9ca2
am: 9d59cecdf9

Change-Id: I7d67ab6601b3756ef59ca034446d2fa27ed125af