DO NOT MERGE. Block adoptable storage when using FBE. am: 84be704af4 am: 1fbe38f424

am: 697cd037ad  -s ours

Change-Id: Ie92c12f205634ff4658ebfc7511eefd65495ad5b
gugelfrei
Jeff Sharkey 8 years ago committed by android-build-merger
commit 28e3a0a4d7

Diff Content Not Available