Merge changes from topic 'fsconfig-2'

am: 1b2de51881

Change-Id: I07622a3603986c42195089eb75e37a22cdba6517
This commit is contained in:
Elliott Hughes 2016-12-10 00:23:56 +00:00 committed by android-build-merger
commit 82b189dcee

Diff content is not available