tree b4c41b378f11d46e64248a4157f087bb87e82d1e
parent b15357267f4f96b4b99c7b3cb3dc2a342538d0e7
parent 608acc9ca2131ea756451e5935e309fbd60ccecd
author Tianjie Xu <xunchang@google.com> 1544573305 -0800
committer android-build-merger <android-build-merger@google.com> 1544573305 -0800

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

Change-Id: I60b84434d54669694523d46c4e854d833306722b