21cbc93de9001e2be5815d1b1dcf703a74a5dacc - platform/cts

commit	21cbc93de9001e2be5815d1b1dcf703a74a5dacc	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Fri Oct 25 16:59:32 2019 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Oct 25 16:59:32 2019 +0000
tree	e5bd22e79a711d27b014f1d61e287f939637a569
parent	2130d20cc11e93af88e77de8aa4ff93c02980604 [diff]
parent	3f21c9bb98d32fdbf1d783dff6f46900b1961b93 [diff]

Merge changes from topic "am-43f19c76-dc30-41fa-ad9d-2650a06f1c02" into nyc-mr2-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f am: f950835e47 am: 850cf9f90d
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f am: f950835e47
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3
  [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195

tree: e5bd22e79a711d27b014f1d61e287f939637a569