tree a7a89e22dfb0a28bab2b322cd0765d44af87c0f5
parent 6e770e4f940a05ac195fb0328f092be8dc4c0934
parent 20e4e73caac45b278546fe0415949e5060f855ef
author Tao Bao <tbao@google.com> 1490740779 +0000
committer android-build-merger <android-build-merger@google.com> 1490740779 +0000

Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98
am: 20e4e73caa

Change-Id: Ib58d2e7843c6cbe75695b83651e3dcd2f9d94f9a