tree 1cb25a67b64952c7d42f4881369db07eba3b3dbd
parent 2a069a9dfdb1941550795fb8c0f57d8c0565cf3b
parent 0146b37256d6a57a0f597bca1c5c04d93bade5c1
author Tao Bao <tbao@google.com> 1465836854 +0000
committer android-build-merger <android-build-merger@google.com> 1465836854 +0000

Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09b
am: 0146b37256

Change-Id: Idfea28dc1824394b60ea5c9ddb8ee77834c2d86a