diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
| commit | 868fa2fe829687343ffae624259930155e16dbd8 (patch) | |
| tree | 54d316199dd9739c57c3aacd131853bbd6554a94 /media/base/vector_math_unittest.cc | |
| parent | bb1bdbd796f966b5bf11f40ecbea12621c7bfac9 (diff) | |
| download | chromium_org-868fa2fe829687343ffae624259930155e16dbd8.tar.gz | |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
Diffstat (limited to 'media/base/vector_math_unittest.cc')
| -rw-r--r-- | media/base/vector_math_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index 9d238f44bc..563cb6bdf9 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc @@ -10,7 +10,7 @@ #include "base/cpu.h" #include "base/memory/aligned_memory.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" #include "base/time.h" #include "media/base/vector_math.h" |