OSDN Git Service

Merge changes from topic 'e2fsdroid' am: da08ba0d8a am: 80339f777f
authorJin Qian <jinqian@google.com>
Tue, 3 Jan 2017 20:51:39 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Jan 2017 20:51:39 +0000 (20:51 +0000)
am: 0607ed1ebe

Change-Id: I02c39b403d65b266464166a9383b88c690e4253f


Trivial merge