tree a64f5025f16be5923262934c2264e2aa1aea958d
parent 1446190e63c260fdd0db2fe390fbe7461c6a5fc2
parent 85f54575c4e6943517bf247a3630f08b3a5de0c6
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.""