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

Merge changes from topic "am-6bfbba45-a281-4b5e-a5c5-2e78c2822097" into nyc-mr1-dev 

* changes:
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-3933 am: 6f6d84d0 am: d60905d0
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-3933 am: 6f6d84d0
  [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-3933
parents b582021f 580ffba9
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