Merge "Docs: Changes to source.android.com"

am: f7613b6660

Change-Id: Ic1b949a7d3a41a11a28579b75c45a1fce65d8882

1 files changed, 7 insertions, 1 deletions

diff --git a/en/devices/storage/adoptable.html b/en/devices/storage/adoptable.html
index 7bef04da..7d167628 100644
--- a/en/devices/storage/adoptable.html
+++ b/en/devices/storage/adoptable.html
@@ -28,10 +28,16 @@
 these accessories were historically limited to simple file storage, due to
 their expected impermanence and the minimal data protection offered to
 <a href="/devices/storage/traditional.html">traditional external storage</a>.
-Android 6.0 introduces the ability to
+Android 6.0 introduced the ability to
 <a href="http://developer.android.com/about/versions/marshmallow/android-6.0.html#adoptable-storage">adopt</a>
 external storage media to act like internal storage.</p>
 
+<p class="warning"><strong>Warning:</strong> <a
+href="/security/encryption/file-based.html">File-based encryption</a> cannot
+currently be used together with adoptable storage. On devices using file-based
+encryption, new storage media (such as an SD card) must be used as <a
+href="/devices/storage/traditional.html">traditional storage</a>.</p>
+
 <p>When external storage media is adopted, it’s formatted and encrypted to only
 work with a single Android device at a time. Because the media is strongly tied
 to the Android device that adopted it, it can safely store both apps and