5b8907015d17f132ecd02abf4319c16c19ac2f43 - platform/cts

commit	5b8907015d17f132ecd02abf4319c16c19ac2f43	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Fri Mar 30 23:55:34 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Mar 30 23:55:34 2018 +0000
tree	31d48c16e2db286ba5b8923081459d17b8b6f95b
parent	389a3f7bc11665bce5376dc18c09f8b201eddf44 [diff]
parent	36ad6d9d34f77da7c1a8878e0d8294afbd40f671 [diff]

Merge changes from topic "am-c3bc699a-3ff1-47e7-ba24-c77957dedb89" into oc-dev

* changes:
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189 am: 263b6a636d am: 05ed58183d am: ea8864d649 am: b72689df3b am: db6408f102
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189 am: 263b6a636d am: 05ed58183d am: ea8864d649 am: b72689df3b
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189 am: 263b6a636d am: 05ed58183d am: ea8864d649
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189 am: 263b6a636d am: 05ed58183d
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189 am: 263b6a636d
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743 am: 9cff170189
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806 am: a8d8b98743
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0 am: 1171adb806
  [automerger] CTS test for Android Security b/33751193 am: 3420621ee0
  CTS test for Android Security b/33751193

tree: 31d48c16e2db286ba5b8923081459d17b8b6f95b