tree f64569c04122801ab4914e5627c8268229c632cc
parent fb0ddb227c4567309d261d29c47825fa91071f2b
parent 6f998b3e595e5c1df51ee8d80bd4d078c69e1e07
author Jin Qian <jinqian@google.com> 1500664003 +0000
committer android-build-merger <android-build-merger@google.com> 1500664003 +0000

Merge changes from topic 'mke2fs_2'
am: 6f998b3e59

Change-Id: Ib65dfb01e37a2b334023df2cbf75363015ea041a