| Index: trunk/src/device/media_transfer_protocol/media_transfer_protocol_manager.cc
|
| ===================================================================
|
| --- trunk/src/device/media_transfer_protocol/media_transfer_protocol_manager.cc (revision 198847)
|
| +++ trunk/src/device/media_transfer_protocol/media_transfer_protocol_manager.cc (working copy)
|
| @@ -14,8 +14,8 @@
|
| #include "base/location.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "base/sequenced_task_runner.h"
|
| #include "base/stl_util.h"
|
| -#include "base/task/sequenced_task_runner.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "dbus/bus.h"
|
| #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
|
|
|
| Property changes on: trunk/src/device/media_transfer_protocol/media_transfer_protocol_manager.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|