tree 49941deb3a415bab8e6590b97234497f80d4088e
parent 6835d52c7ea770efc8f2d8d8c8727c94abe5426d
parent c6df7d2937ca304660b74fb81e0d8ef07a217d1b
author Tao Bao <tbao@google.com> 1490740061 +0000
committer android-build-merger <android-build-merger@google.com> 1490740061 +0000

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

Change-Id: Iea518cbea5e64bd06475c472f88c6cc8c75602d6