047fa4a148d6f9e30cc088b9d8c99e6b3b609220 - platform/cts

commit	047fa4a148d6f9e30cc088b9d8c99e6b3b609220	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Thu Apr 19 22:18:01 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Apr 19 22:18:01 2018 +0000
tree	aa228884062323a4003053219e1952d71df0eaac
parent	f82ac602c9d71304a8751c69b4f78168165d7914 [diff]
parent	1d8114c2f297b3d801999b4e1b0898dba2434797 [diff]

Merge changes from topic "am-473265a3-0419-4362-9a2d-8d61627e5337" into oc-dev

* changes:
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab am: a79e19d47a am: 58e7301bde am: 01250f6bd7 am: f6b1276085 am: c345e63f86
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab am: a79e19d47a am: 58e7301bde am: 01250f6bd7 am: f6b1276085
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab am: a79e19d47a am: 58e7301bde am: 01250f6bd7
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab am: a79e19d47a am: 58e7301bde
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab am: a79e19d47a
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f am: ac58b783ab
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce
  [automerger] CTS test for Android Security b/28816956 am: 29343c18d8
  CTS test for Android Security b/28816956

tree: aa228884062323a4003053219e1952d71df0eaac