tree f05d9f809ab33a0ec66e31bcb546b675d84b7f42
parent e17593e162cbc718878396171c90036e285a585a
parent 2a67b023bd615d43d2f9ee00c62049e11ea85379
author Florian Mayer <fmayer@google.com> 1557350647 -0700
committer android-build-merger <android-build-merger@google.com> 1557350647 -0700

[automerger skipped] Match maximum command line size for startup tracing.
am: 2a67b023bd -s ours
am skip reason: change_id Iad2398bc09c61b1144430bcbef58e5a832b85b0a with SHA1 f6d221eeed is in history

Change-Id: I8e42c8c2e6039cb50b705e2b1719f57f80bad719