tree c56ea1e5bfddeaef3f762302c95d5dc3215d502e
parent 0f9140b50ace1a7d5b5761722ad495c75cbf2bac
parent dd6166e63692ed7d6035e96e1ffd76541d6312e0
author Florian Mayer <fmayer@google.com> 1557247475 -0700
committer android-build-merger <android-build-merger@google.com> 1557247475 -0700

Merge "Match maximum command line size for startup tracing." am: 0633e569bc
am: dd6166e636

Change-Id: I54d9de1f1d123b2ce0024c89dc59ac3320663107