tree 2f3bbd79b3023a4782574cdbb537ecbd61a72d4e
parent ceba42dca983e79b1a1255e78e51a3d85d3b8f9e
parent 361d379280010976ff1d4df58ac8f317f28299c0
author Tianjie Xu <xunchang@google.com> 1550087734 -0800
committer android-build-merger <android-build-merger@google.com> 1550087734 -0800

Merge "Improved wipe reason information for RecoverySystem" am: c8f5981028
am: 361d379280

Change-Id: I224a98abd065bf5437d4a2ea242f146e91740ef1