tree 5a871c288587055811e10d7c981812fe8353fa80
parent 2bbab0e2b402050252b7e849ae8af519e166d7ed
parent 4105768e215a9c69f147d7cd4fdb377e86b4ce54
author TreeHugger Robot <treehugger-gerrit@google.com> 1501259806 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501259806 +0000

Merge changes Iab5fae74,I3d5076ca into oc-mr1-dev

* changes:
  Tidy up RulesManagerService code
  Remove TODO related to WakeLocks