5d63751685cc662a337042d7a79d98c05ca28dcf - platform/cts

commit	5d63751685cc662a337042d7a79d98c05ca28dcf	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Tue May 22 06:37:19 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue May 22 06:37:19 2018 +0000
tree	4ef781014670c94553e8b04afd911eeb1d2cb776
parent	fae68b55182e19dd92731e94d789010d7321b45d [diff]
parent	ce323588801476ca1952ff38eaa9f776efe0daab [diff]

Merge changes from topic "am-f09a9ecb-36ab-48ad-9891-c5de5d437800" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4 am: 400bc8fbae am: 5be80d769a am: 3f62100fcd skipped: 24da8b4875
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4 am: 400bc8fbae am: 5be80d769a am: 3f62100fcd
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4 am: 400bc8fbae am: 5be80d769a
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4 am: 400bc8fbae
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4
  [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981

tree: 4ef781014670c94553e8b04afd911eeb1d2cb776