tree 3e2162f35b3e0b7c4563916990aa6c80d4b97f21
parent f1130df2455fc6dda2d61a4f31bb97dcff1c0acd
parent 0b69bcaa4078f3855bcc840f1638bd5f84672cfe
author Jin Qian <jinqian@google.com> 1493854716 +0000
committer android-build-merger <android-build-merger@google.com> 1493854716 +0000

Merge "e2fsdroid: skip setting timestamp if src_dir is null" am: 930bc06448
am: 0b69bcaa40

Change-Id: I80400e2b51b0b1f849cf72cb1fb6cfa83fec9ba6