efe2e87c8c2061021c6b69ee8ffa0447f32ed771 - platform/cts

commit	efe2e87c8c2061021c6b69ee8ffa0447f32ed771	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Fri Jun 29 21:00:32 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Jun 29 21:00:32 2018 +0000
tree	9a3da8766603b5f04455a70e726dea9fd83020ad
parent	1dc36e5b18179d11a7a38d85bce1e9d8b674e229 [diff]
parent	83797fa7c3f2c5edc12b46b6858ca9f93a4761be [diff]

Merge changes from topic "am-5d94ddc8-4437-49fd-9932-8c5b453727c7" into nyc-mr2-dev

* changes:
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6 am: 83b82ec94b am: 717386dbe4 am: 4ba6c68450
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6 am: 83b82ec94b am: 717386dbe4
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6 am: 83b82ec94b
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776
  CTS test for Android Security b/72507266 b/28165659

tree: 9a3da8766603b5f04455a70e726dea9fd83020ad