OSDN Git Service

Merge changes Ifee27c86,I9ffa4b00
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 25 Oct 2017 17:05:44 +0000 (17:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Oct 2017 17:05:44 +0000 (17:05 +0000)
commit40e1dd673e906d04bc01016b71d10b5eb9cba969
tree288a9df9fb4d5cb102e493a88e9f2256e430515f
parent17e5e2e57313a1a6c3bfcb3c4cf380570df9f388
parente588524f8980106098fa4f0900b6f4bb69b77ec1
Merge changes Ifee27c86,I9ffa4b00

* changes:
  Add more atoms to statsd
  Add wakelock atom to statsd