Commit 6306749c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] CTS test for Android... 

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/34897036"" into oc-dev am: c25c3764 am: 1bc692c0 am: 1a69ea97 -s ours

am skip reason: subject contains skip directive

Change-Id: I3827dc196e1e50d28ca5bda0e1e1ca239be465dd
parents 3b683b99 1a69ea97
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