tree d196a1ef589bf69bf0c75b7e959991b9b915ed06
parent 48dad606c5ecfaa7bdd1c3c36c12a7b9418e6a5b
parent 1533ffdc3e8dc775399a8c02039e0ad3e7f3ca1f
author TreeHugger Robot <treehugger-gerrit@google.com> 1501813130 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501813130 +0000

Merge "There must not have newline character in wakelock name" into oc-mr1-dev