ca8dc45d62799e8f8ccc5c97f4ddbab550afdafa - platform/cts

commit	ca8dc45d62799e8f8ccc5c97f4ddbab550afdafa	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Tue Sep 18 19:31:15 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Sep 18 19:31:15 2018 +0000
tree	ff1ba4aaaec770abd3d967e98f028f50fbee003e
parent	8c14fd8f6ebbe3e4fe1c21ab517fbecd5e74218d [diff]
parent	3445004d9d91e909aec57a73f5f242184b7bfa60 [diff]

Merge changes from topic "am-82ccc496-ed65-4f6e-81f7-60006a43a473" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930 am: 2d567bf767 am: 0b22a089bc am: 1c9419fb2b am: d68f15ca14 skipped: 14c8aa2daa
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930 am: 2d567bf767 am: 0b22a089bc am: 1c9419fb2b am: d68f15ca14
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930 am: 2d567bf767 am: 0b22a089bc am: 1c9419fb2b
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930 am: 2d567bf767 am: 0b22a089bc
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930 am: 2d567bf767
  [RESTRICT AUTOMERGE]: CTS test for Android security b/72509296 b/26593930

tree: ff1ba4aaaec770abd3d967e98f028f50fbee003e