tree 7eb853f8a2f34e16213c97a5951a52fb9f068027
parent df2067d038b0ad7372cd83fce7da5eb9754cfd0d
parent de5ba7ab97de2a27301b010d023e44d5ec46e8d4
author Tianjie Xu <xunchang@google.com> 1552008546 -0800
committer android-build-merger <android-build-merger@google.com> 1552008546 -0800

Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae
am: de5ba7ab97

Change-Id: Ifa7953e465954fc733688d4288a740022362be2a