tree dbf221e91c54b766f6da81e50cbe8a2a7e6b5aa5
parent d241c85cd0a1bc3b73af2e1faa99fcb7c7ad2b84
parent dc1393d09bcc09ae246cd46b2248d9401605d0f5
author Tao Bao <tbao@google.com> 1465836643 +0000
committer android-build-merger <android-build-merger@google.com> 1465836643 +0000

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

Change-Id: I7ec8d93bb41d0bd7f921fbb97c5b8639798e3bec