tree 555fdd24761fd4713b3f261bb9ec8207efb1d36c
parent 1356636a70a90322110fe75c84b19482785faf44
parent 9784ce307fd2497c7878e01e35c5fede67e8a88e
author Tao Bao <tbao@google.com> 1506572187 +0000
committer android-build-merger <android-build-merger@google.com> 1506572187 +0000

Merge "ext4_utils: make file system image reproducible" into oc-mr1-dev
am: 9784ce307f

Change-Id: Icf59233cfc3a6e399894ab92855a8d764e0fb772