tree f8d6b0fc695ccdccde0bf7674ad3ad0f578be9ba
parent 74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea
parent e477a54c8df47d67b401b7367b70565987554d87
author Jerry Zhang <zhangjerry@google.com> 1483558456 +0000
committer android-build-merger <android-build-merger@google.com> 1483558456 +0000

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

Change-Id: I2fe7b5ebfea0216808b721a76eb816106b56e0cb