tree 0588af235c465fe2bddeae300ab8d76fa9ac8d2b
parent 7827bc93344f205d40e84e67fbaf48e39a4587f3
parent 88871462e08d8bcdeb67a53c88ac486f162e56bc
author TreeHugger Robot <treehugger-gerrit@google.com> 1507581449 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507581449 +0000

Merge changes from topic "wear_small_battery-master"

* changes:
  Revert device idle timing changes for small battery devices.
  Removing watch specific DeviceIdleController logic in favor of small battery device flag