commit 11b9a24d51f5c4b95185a13fc46481a05b0a5274
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 20:54:48 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 20:54:48 2017 +0000
tree 612f45d8cb649b7207c8fc970587df0c0d4f0dbc
parent 05b755652ab5525cec8be5a3f9876384c2f83269
parent b5d1e187cf4a178173a01b93330bcfc262283f7c

Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760, 2454860, 2454838, 2454899, 2454970, 2455005, 2455027, 2454973, 2455006, 2455061, 2455007, 2454914, 2454987, 2454974] into oc-release

Change-Id: Ia50b2d742908507fedd9dc7ff59ee90d65c8c4c6

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 8758516..47e04e7 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -770,7 +770,8 @@
     ok &= setCategoriesEnableFromFile(g_categoriesFile);
     ok &= setTraceOverwriteEnable(g_traceOverwrite);
     ok &= setTraceBufferSizeKB(g_traceBufferSizeKB);
-    ok &= setCmdlineSize();
+    // TODO: Re-enable after stabilization
+    //ok &= setCmdlineSize();
     ok &= setClock();
     ok &= setPrintTgidEnableIfPresent(true);
     ok &= setKernelTraceFuncs(g_kernelTraceFuncs);