OSDN Git Service

Merge "Only replace new line characters if the wakelock name contains one The origina...
authorYi Jin <jinyithu@google.com>
Mon, 7 Aug 2017 21:43:28 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 21:43:28 +0000 (21:43 +0000)
am: 311cc0b99d

Change-Id: I0bae1c8199771608571c208cb176c1c66f5ef08f


Trivial merge