66360b8a0af0c1ccee096d668031f8e96be25f9f - platform/cts

commit	66360b8a0af0c1ccee096d668031f8e96be25f9f	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Thu Apr 19 22:18:48 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Apr 19 22:18:48 2018 +0000
tree	666698f9a163a5725a0465de387c175a2f4a9912
parent	047fa4a148d6f9e30cc088b9d8c99e6b3b609220 [diff]
parent	d3d80988628bab1bb47de909809121d08598b419 [diff]

Merge changes from topic "am-8b8b226c-181d-4270-8a63-9047f7e19aaa" into oc-dev

* changes:
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b am: 945f842964 am: 34726c7253 am: 8a87d42a42 am: 59a6ec179a
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b am: 945f842964 am: 34726c7253 am: 8a87d42a42
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b am: 945f842964 am: 34726c7253
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b am: 945f842964
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696
  [automerger] CTS test for Android Security b/33818500 am: bd6ec9c818
  CTS test for Android Security b/33818500

tree: 666698f9a163a5725a0465de387c175a2f4a9912