Merge "allow dump_report command to output proto binary in addition to text"

diff --cc cmds/statsd/src/StatsService.cpp
index 7eca5aa,f2ea943..9259793
--- 1/cmds/statsd/src/StatsService.cpp
--- 2/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@@ -281,10 -289,8 +281,10 @@@ void StatsService::print_cmd_help(FILE
      fprintf(out, "                uid is used.\n");
      fprintf(out, "  NAME          The per-uid name to use\n");
      fprintf(out, "\n");
 +    fprintf(out, "\n              *Note: If both UID and NAME are omitted then all configs will\n");
 +    fprintf(out, "\n                     be removed from memory and disk!\n");
      fprintf(out, "\n");
-     fprintf(out, "usage: adb shell cmd stats dump-report [UID] NAME\n");
+     fprintf(out, "usage: adb shell cmd stats dump-report [UID] NAME [--proto]\n");
      fprintf(out, "  Dump all metric data for a configuration.\n");
      fprintf(out, "  UID           The uid of the configuration. It is only possible to pass\n");
      fprintf(out, "                the UID parameter on eng builds. If UID is omitted the\n");