OSDN Git Service

DO NOT MERGE. Block adoptable storage when using FBE. am: 84be704af4 am: 1fbe38f424
authorJeff Sharkey <jsharkey@android.com>
Thu, 1 Sep 2016 01:08:16 +0000 (01:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 01:08:16 +0000 (01:08 +0000)
am: 697cd037ad  -s ours

Change-Id: Ie92c12f205634ff4658ebfc7511eefd65495ad5b


Trivial merge