tree ade3ef95bbf228fd14d96d44a451b3d2b23f55b3
parent d1b10b20f6afa8e538fc447e8816e67a88611d6b
author Elliott Hughes <enh@google.com> 1481592524 -0800
committer Elliott Hughes <enh@google.com> 1481592524 -0800

Revert "Merge changes from topic 'fsconfig-2'"

This reverts commit 1b2de51881e0ff76e2ad9d3d0405fc7185b0f86f, reversing
changes made to 77ea32f378651a3585e245eb964dab979d191310.