tree 0091ce48aa5c04f1e13f3b7a15a302d3550cd640
parent 6c72edd1a4014fec56db65f77ebcd84588b7229a
parent c0bd0939c9b4e89b5fad6c89bbc09c46f46acd50
author TreeHugger Robot <treehugger-gerrit@google.com> 1584143781 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1584143781 +0000

Merge changes I82056aae,I3977680d into oc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/37761553
  [RESTRICT AUTOMERGE] CTS test for Android Security b/24346430