Merge changes from topic 'fsconfig-2'

am: b0aa8b2369

Change-Id: I74940187c6aa296af360a93718015d6aaf3bce38
This commit is contained in:
Elliott Hughes 2016-12-10 00:24:28 +00:00 committed by android-build-merger
commit 1e62d3e0b8

Diff content is not available