Commit 9a0808a8 authored by Matt Fitzpatrick's avatar Matt Fitzpatrick Committed by android-build-merger
Browse files

[automerger skipped] [automerger] Revert "Revert "[RESTRICT AUTOMERGE] Revert... 

[automerger skipped] [automerger] Revert "Revert "[RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/37710346""" am: 9cbd418f am: 85eb3554 am: 055a1c63 am: 33ddcf6e skipped: e7ec1d10 am: a8f05b07 am: 0b4171d3
am: 8456a04b -s ours
am skip reason: subject contains skip directive

Change-Id: I4d035e8e05158ba1e58ea1b442616350d7ca6a89
parents 26178a9c 8456a04b
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