| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Wed Jun 19 11:58:07 2013 +0100 |
| committer | Torne (Richard Coles) <torne@google.com> | Wed Jun 19 11:58:07 2013 +0100 |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 [diff] [blame] |
Merge from Chromium at DEPS revision r207203 This commit was generated by merge_to_master.py. Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h index 9b0ac4a..a017e29 100644 --- a/device/bluetooth/bluetooth_adapter_win.h +++ b/device/bluetooth/bluetooth_adapter_win.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/hash_tables.h" +#include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h"