commit d5ea04a874cec79ccad8235e981c8890df868c82
author JP Sugarbroad <jpsugar@google.com> Tue May 22 21:35:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 22 21:35:07 2018 +0000
tree 0f7d0b9b38eedbe427e3b6dc81d123269a04f7d8
parent 62d785d4feafd8caa9d692a624c001e2a04696a1
parent 5a2e3e240221533e1b3a077a7db1dda29b04f57f

Merge changes from topic "am-896be361-a4b1-43e7-b1d4-8f471894d3a2" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232 am: ef54e1254e am: 551cd26bef am: 55e93f25bb am: 38753441b8 skipped: 5adf0936ee
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232 am: ef54e1254e am: 551cd26bef am: 55e93f25bb am: 38753441b8
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232 am: ef54e1254e am: 551cd26bef am: 55e93f25bb
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232 am: ef54e1254e am: 551cd26bef
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232 am: ef54e1254e
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5 skipped: a5b895e232
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab am: 126f1c99d5
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf am: 4e101878ab
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: bf75ae1daf
  [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103