| Index: tools/battor_agent/battor_agent_bin.cc
 | 
| diff --git a/tools/battor_agent/battor_agent_bin.cc b/tools/battor_agent/battor_agent_bin.cc
 | 
| index 5843ae906b10f6e3f97aaf7075808cda945e38ef..c8a6eb2a84046e0687db4cae1df34943248aea32 100644
 | 
| --- a/tools/battor_agent/battor_agent_bin.cc
 | 
| +++ b/tools/battor_agent/battor_agent_bin.cc
 | 
| @@ -7,6 +7,8 @@
 | 
|  // controllers, such as Telemetry and Android Systrace, to issue high-level
 | 
|  // tracing commands to the BattOr..
 | 
|  
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include <iostream>
 | 
|  
 | 
|  #include "base/at_exit.h"
 | 
| @@ -25,7 +27,7 @@ namespace {
 | 
|  const char kIoThreadName[] = "BattOr IO Thread";
 | 
|  const char kFileThreadName[] = "BattOr File Thread";
 | 
|  const char kUiThreadName[] = "BattOr UI Thread";
 | 
| -const int32 kBattOrCommandTimeoutSeconds = 10;
 | 
| +const int32_t kBattOrCommandTimeoutSeconds = 10;
 | 
|  
 | 
|  void PrintUsage() {
 | 
|    std::cout << "Usage: battor_agent <command> <arguments>" << endl
 | 
| 
 |