OSDN Git Service

Merge changes from topic 'fsconfig-2' am: 1b2de51881
authorElliott Hughes <enh@google.com>
Sat, 10 Dec 2016 00:30:25 +0000 (00:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Dec 2016 00:30:25 +0000 (00:30 +0000)
am: 82b189dcee

Change-Id: I6e643b1f61aaf7bcbc9370f6aff9543208a51bb6


Trivial merge