8141d9b748bd6f849b2c4cd7347dd318e2ad1066 - platform/cts

commit	8141d9b748bd6f849b2c4cd7347dd318e2ad1066	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Wed Dec 05 18:10:38 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Dec 05 18:10:38 2018 +0000
tree	eeb31ef485150700bdebc4b8c544c3dc11663758
parent	75da8c13b6c9ecb7ebf8b81b48e326f557e22805 [diff]
parent	ce16a4186cff177ccb4cca3a92bc8ecac5edcc39 [diff]

Merge changes from topic "am-0ba91612-8ece-42d3-8909-c25470ab8d87" into oc-dev

* changes:
  [automerger] Revert "CTS test for Android security b/28026365" am: 1c118cd6f3 skipped: 687d75d974 am: 79cc7daa17 am: 017f577d99 am: 0a4888cb2f
  [automerger] Revert "CTS test for Android security b/28026365" am: 1c118cd6f3 skipped: 687d75d974 am: 79cc7daa17 am: 017f577d99
  [automerger] Revert "CTS test for Android security b/28026365" am: 1c118cd6f3 skipped: 687d75d974 am: 79cc7daa17
  [automerger] Revert "CTS test for Android security b/28026365" am: 1c118cd6f3 skipped: 687d75d974
  [automerger] Revert "CTS test for Android security b/28026365" am: 1c118cd6f3
  Revert "CTS test for Android security b/28026365"

tree: eeb31ef485150700bdebc4b8c544c3dc11663758