OSDN Git Service

Merge \\\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\\" into...
authorAdam Lesinski <adamlesinski@google.com>
Fri, 29 Jul 2016 16:06:41 +0000 (16:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 16:06:41 +0000 (16:06 +0000)
am: 297267f4f9  -s ours

Change-Id: Ic0bd531bdabb25fc2501753ac401c201aec4f97b


Trivial merge