tree 985c7f8276524b16b771d1a8f9f9607103eca6bb
parent 5c461fc36d79d13b037ef928beb38fdb64e94057
parent 8fa9ffcdc0dcdc4c7b67b2df60fa3f46ff3066d4
author Steve McKay <smckay@google.com> 1453922707 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1453922707 +0000

Merge "Revert "Eliminate the "productivity_device" setting.""