OSDN Git Service

Merge changes from topic 'mke2fs_2' am: 6f998b3e59 am: a05b989ff4 am: c8cda2e3e3
authorJin Qian <jinqian@google.com>
Fri, 21 Jul 2017 22:47:26 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Jul 2017 22:47:26 +0000 (22:47 +0000)
am: 1348766c20

Change-Id: I86b0978a744defd82be8c3efa148678b9a13291c


Trivial merge