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

Merge changes from topic "am-d0ebe25c-c83b-4fa7-aa75-ada153219d90" into nyc-mr1-dev 

* changes:
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400 am: 1af60547 am: 96cf9846
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400 am: 1af60547
  [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400
parents e928f367 702f73bb
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