OSDN Git Service

Merge changes from topic 'fsconfig2-fixups'
authorElliott Hughes <enh@google.com>
Thu, 5 Jan 2017 00:31:18 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 00:31:18 +0000 (00:31 +0000)
am: abf3dbe248

Change-Id: I0149e85d05c3fb60f8ab0e878a3a8172a1edaede


Trivial merge