commit aa5ffaeef28f3c9de7f6ed3a5d21aeca4562eadc
author Jeff Sharkey <jsharkey@android.com> Thu Sep 10 00:53:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 10 00:53:30 2015 +0000
tree 4865388b3073e1a6c1f119acad4cbe02a9d734f2
parent 34c02173c8695e197869423bcd52fd3837ff29eb
parent 1690c1bca2b7d7e08f1b0f536b6e58a890051546

am 1690c1bc: am 1a20a648: Enable benchmark after trim, when requested.

* commit '1690c1bca2b7d7e08f1b0f536b6e58a890051546':
  Enable benchmark after trim, when requested.

TrimTask.cpp

diff --git a/TrimTask.cpp b/TrimTask.cpp
index 1c6eb1f..94bd097 100644
--- a/TrimTask.cpp
+++ b/TrimTask.cpp
@@ -37,7 +37,7 @@
 /* From a would-be kernel header */
 #define FIDTRIM         _IOWR('f', 128, struct fstrim_range)    /* Deep discard trim */
 
-#define BENCHMARK_ENABLED 0
+#define BENCHMARK_ENABLED 1
 
 using android::base::StringPrintf;