tree 3e2162f35b3e0b7c4563916990aa6c80d4b97f21
parent 42c649def28801a248866bfcfee26c432b5033eb
parent 930bc064484de01c6791b0e2fb7aee33fd1aa0c2
author Jin Qian <jinqian@google.com> 1493854565 +0000
committer android-build-merger <android-build-merger@google.com> 1493854565 +0000

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

Change-Id: Ied1e99d9729711e5b27ee690c2fff68243050fa7