diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 11:54:19 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 11:54:19 +0000 |
| commit | e298ded6ade9744f2a79cae045b5c324886262f4 (patch) | |
| tree | 0b16bb0fe3430dd224dabf4b3c87176ba1b0f91c /server/TetherController.cpp | |
| parent | a4614fe5bfaafd0ff6be60ddb6fd135f99f5a5a5 (diff) | |
| parent | 6066d41889ada93c5312e081d5bdff94fc1fd2af (diff) | |
resolved conflicts for merge of 6066d418 to master
Change-Id: I2aa9721365e96c363648dd8e9e15718ed50e3c12
Diffstat (limited to 'server/TetherController.cpp')
| -rw-r--r-- | server/TetherController.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server/TetherController.cpp b/server/TetherController.cpp index 092d4566..5a08ed21 100644 --- a/server/TetherController.cpp +++ b/server/TetherController.cpp @@ -27,19 +27,16 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <base/file.h> #define LOG_TAG "TetherController" #include <cutils/log.h> #include <cutils/properties.h> +#include <utils/file.h> #include "Fwmark.h" #include "NetdConstants.h" #include "Permission.h" #include "TetherController.h" -using android::base::ReadFileToString; -using android::base::WriteStringToFile; - namespace { static const char BP_TOOLS_MODE[] = "bp-tools"; |