tree 09140a70842f12b8f52447d0e9762143e06fd07a
parent 24dcf7890f17c1285f1865f7bfd47e9b5396e11a
parent 4bf937157dcce09b93704e489b1be3074f94f4ba
author David Anderson <dvander@google.com> 1526416141 -0700
committer android-build-merger <android-build-merger@google.com> 1526416141 -0700

Merge "init/fs_mgr: prototype first-stage dm-linear support" am: 3e946da535
am: 4bf937157d

Change-Id: I742f493439afa885a54965f3425907fac99253fd