tree 37652c71f3337162375308a681e29f195b847961
parent 339e884bc0eda3500a2ddd81a85b04d2c27f873e
author Julia Reynolds <juliacr@google.com> 1445889208 -0400
committer Julia Reynolds <juliacr@google.com> 1446220520 -0400

Synchronize updates to zen config.

Also, remove some dead code.

Change-Id: If6f4432638aebcedf59a4804a3b5d14b73f12549