tree 7ac7aa45a571feef3f218c3fdcb45ff2fd2032e9
parent de36f5ed6b0312f584d6f0c90f331cd4ebd8e613
parent 63e4cc1d1613ba958fe0b550d0392b6d46058f26
author Johan Harvyl <johan.harvyl@sonymobile.com> 1471284966 +0000
committer android-build-merger <android-build-merger@google.com> 1471284966 +0000

Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1
am: 63e4cc1d16

Change-Id: Ib6533e78255613f4b608aa976cd3221a998b0644