6daed29dfcffe102451d86b079127abfae15f6f4 - platform/cts

commit	6daed29dfcffe102451d86b079127abfae15f6f4	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Thu Jun 07 20:23:15 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Jun 07 20:23:15 2018 +0000
tree	b7d060fb553da20d55b17cc58b748d43563aa51b
parent	0a55ce6b7bc1dd97ea7d7a7c6e6a6236389bd582 [diff]
parent	e389661391b93019a6b995eb4f83979653d97d50 [diff]

Merge changes from topic "am-d272918e-a99d-4306-988b-0886b4086a2c" into nyc-mr2-dev

* changes:
  [automerger] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453" am: c2795f89b1 am: 0245c1bf49 am: ba0ade4ca2 am: 7bc56a149a
  [automerger] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453" am: c2795f89b1 am: 0245c1bf49 am: ba0ade4ca2
  [automerger] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453" am: c2795f89b1 am: 0245c1bf49
  [automerger] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453" am: c2795f89b1
  Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453"

tree: b7d060fb553da20d55b17cc58b748d43563aa51b