Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev am: c081d2b870

am: 8215d988eb

Change-Id: Ia55bb188f420fca11dadcc940505d297a0a5f16d
This commit is contained in:
Jeff Sharkey
2016-08-31 23:47:42 +00:00
committed by android-build-merger

Diff Content Not Available