tree 6502156812b74e2bf40f148ee9d5697ef98d67d1
parent 0c3057ff014ea08972eacc8fd73e9a27a241a2cf
parent 336af5783c89dcaa4e8c2edbf7c620483b358cdc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578336412 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578336412 +0000

Merge "Add TAG_MAC_LENGTH to EncryptionOperationsTest.AesWrongPurpose" am: a4bffdbeb0 am: 336af5783c

Change-Id: I89aaaf06faeb540428539e13130839490ae53d32