tree 0ff03f99e09e4f02e439512e27cbaffb8ea193e3
parent 66edafb88fd9ada71b8c9120d10c07e18b3c9c96
parent 6bec66849bff8aba130d61c92065aa0ec0c0e7f3
author Jerry Zhang <zhangjerry@google.com> 1483558606 +0000
committer android-build-merger <android-build-merger@google.com> 1483558606 +0000

Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8d
am: 6bec66849b

Change-Id: I65ac28ca11d566fb73288940e954faacd378354c