diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /device | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'device')
| -rw-r--r-- | device/device_tests.gyp (renamed from device/device.gyp) | 0 | ||||
| -rw-r--r-- | device/usb/OWNERS | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/device/device.gyp b/device/device_tests.gyp index bdc387c211..bdc387c211 100644 --- a/device/device.gyp +++ b/device/device_tests.gyp diff --git a/device/usb/OWNERS b/device/usb/OWNERS index 2ffd61a8ff..51dcadeaa3 100644 --- a/device/usb/OWNERS +++ b/device/usb/OWNERS @@ -1,2 +1,3 @@ +ikarienator@chromium.org gdk@chromium.org bryeung@chromium.org |