tree bca4b744e39c7fe8769f37e01e5ea8242cbc3933
parent 8727aa100f26106ab2b7ae94ee39541e5237c824
parent 29d01fa1f3b6332d4c845d2794046943c30393b5
author Daniel Rosenberg <drosen@google.com> 1460593283 +0000
committer android-build-merger <android-build-merger@google.com> 1460593283 +0000

Merge "Add nofail fstab option"
am: e992831

* commit 'e99283103bbd06a2b8a40971ed161d9d0518f79e':
  Add nofail fstab option

Change-Id: Iada8393491847037b33e7de4ac5ccf3b7e9eba6f