The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cc13e05195645290555d16efde372d9a4128a86e

commit cc13e05195645290555d16efde372d9a4128a86e
Author: Stuart Langley <slangley@google.com>
Date: Thu Aug 16 05:08:16 2018

Add support for multiple team drives having the same name.

- For calls to ::ReadDirectory(path), start reading from all team drives that
  match the root.
- In change list processor, for team drives lookup the correct ID from
  resource metadata to get the root rather than using the path.
- Add test cases for 2 team drives with the same name.
- Fixup failing tests.

Bug:  873950 
Change-Id: Ic90577dd911dd5eb20b1d968f42dd2ce24ad846a
Reviewed-on: https://chromium-review.googlesource.com/1174585
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583541}
[modify] https://crrev.com/cc13e05195645290555d16efde372d9a4128a86e/components/drive/chromeos/change_list_processor.cc
[modify] https://crrev.com/cc13e05195645290555d16efde372d9a4128a86e/components/drive/chromeos/file_system.cc
[modify] https://crrev.com/cc13e05195645290555d16efde372d9a4128a86e/components/drive/file_system_unittest.cc

This bug requires manual review: M69 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), kariahda@(iOS), cindyb@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Merge approved, M69.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f89092a004c1bbb437be42bec074664f3db649dd

commit f89092a004c1bbb437be42bec074664f3db649dd
Author: Stuart Langley <slangley@google.com>
Date: Mon Aug 20 22:26:17 2018

Add support for multiple team drives having the same name.

- For calls to ::ReadDirectory(path), start reading from all team drives that
  match the root.
- In change list processor, for team drives lookup the correct ID from
  resource metadata to get the root rather than using the path.
- Add test cases for 2 team drives with the same name.
- Fixup failing tests.

Bug:  873950 
Change-Id: Ic90577dd911dd5eb20b1d968f42dd2ce24ad846a
Reviewed-on: https://chromium-review.googlesource.com/1174585
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#583541}(cherry picked from commit cc13e05195645290555d16efde372d9a4128a86e)
Reviewed-on: https://chromium-review.googlesource.com/1182421
Reviewed-by: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#728}
Cr-Branched-From: 271eaf50594eb818c9295dc78d364aea18c82ea8-refs/heads/master@{#576753}
[modify] https://crrev.com/f89092a004c1bbb437be42bec074664f3db649dd/components/drive/chromeos/change_list_processor.cc
[modify] https://crrev.com/f89092a004c1bbb437be42bec074664f3db649dd/components/drive/chromeos/file_system.cc
[modify] https://crrev.com/f89092a004c1bbb437be42bec074664f3db649dd/components/drive/file_system_unittest.cc