Commit a0341598 authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into... 

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a020161  -s ours
am: bdedf741

* commit 'bdedf741':
  DO NOT MERGE CipherTest: add test for multiple updateAAD calls

Change-Id: I4661f654d144f663c3f6e6e4c19789d1f11e8eab
parents 4679dc10 bdedf741
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment