tree f8d6b0fc695ccdccde0bf7674ad3ad0f578be9ba
parent 3806993e2532704d6569b67352fce9c42650fd74
parent 9f9d50d4ed1acf20a844b2729d26488db849ff57
author Jerry Zhang <zhangjerry@google.com> 1483558306 +0000
committer android-build-merger <android-build-merger@google.com> 1483558306 +0000

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

Change-Id: I456a4b44b4a4df7d7752ee66784d26a94249c41c