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

am: c081d2b870

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

Diff Content Not Available