tree b4c41b378f11d46e64248a4157f087bb87e82d1e
parent 00ab5cd4f73aa01691058d482f88913baecab410
parent c456aab7e26ceaa8a322668122029c85a4eb4c31
author Tianjie Xu <xunchang@google.com> 1544571559 -0800
committer android-build-merger <android-build-merger@google.com> 1544571559 -0800

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

Change-Id: Id1dfc9ca935b8d5f88387b55809dd152fe600544