Commit 2180c15e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-254b7307-4e73-4da2-a305-c1cf8b4ff53d" into nyc-mr1-dev 

* changes:
  [automerger] [RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727"" am: 745f2a97 am: e90facab
  [automerger] [RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727"" am: 745f2a97
  [RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727""
parents 8c00cc80 ba9fac71
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