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)
commit1b827f8fd32cf817f8371d9d7c05366045d7ac23
treec3a8ffa4586e101394b3f70c99102d358bec0a19
parentd04e585b8978daa303a0f612bdda51d4eae2b78a
parent82b189dceea378269403e8f6a5f40fbbef201fbc
Merge changes from topic 'fsconfig-2' am: 1b2de51881
am: 82b189dcee

Change-Id: I6e643b1f61aaf7bcbc9370f6aff9543208a51bb6