OSDN Git Service

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

Change-Id: Ic1c4965089d18636bb2603c65f6d1cad8a316900


Trivial merge