130 files changed, 51 insertions, 15 deletions

diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 2505746..82836e2 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -1592,6 +1592,7 @@ var RESOURCE_COLLECTIONS = {
     "resources": [
       "training/enterprise/app-compatibility.html",
       "training/enterprise/app-restrictions.html",
+      "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
       "samples/AppRestrictionSchema/index.html",
       "samples/AppRestrictionEnforcer/index.html"
     ]
@@ -1636,4 +1637,4 @@ var RESOURCE_COLLECTIONS = {
        "tools/performance/batterystats-battery-historian/charts.html"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 87581e9..5b2468d 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -2917,6 +2917,42 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "type":"about"
   },
   {
+    "title":"App Configurations, Testing and Launchers",
+    "titleFriendly":"",
+    "summary":"With Android for Work you can make your apps remotely configurable. We also cover how to test your app in a managed environment.",
+    "url":"https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"http://i1.ytimg.com/vi/39NkpWkaH8M/maxresdefault.jpg",
+    "lang":"en",
+    "type":"about"
+  },
+  {
+    "title":"Building an enterprise ready app",
+    "titleFriendly":"",
+    "summary":"A holistic view of Android for Work for developers.",
+    "url":"https://www.youtube.com/watch?v=dH41OutAMNM",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"http://i1.ytimg.com/vi/dH41OutAMNM/maxresdefault.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Android for Work: Single Use Devices",
+    "titleFriendly":"",
+    "summary":"Single-purpose computers are everywhere, and Android can meet that need.",
+    "url":"https://www.youtube.com/watch?v=j3QC6hcpy90",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"http://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+    "lang":"en",
+    "type":"about"
+  },
+  {
     "title":"Discover YouTube cards",
     "titleFriendly":"",
     "summary":"Find out more about YouTube cards, the options available, and how to use them to get the most from your YouTube content.",
@@ -3311,4 +3347,4 @@ var CAROUSEL_OVERRIDE = {
     "summary": "We’ve created a downloadable guide to help you find success with your app or game business on Google Play. In it, you’ll find features, tips, and best practices to help you build an effective strategy.",
     "tags": []
   }
-};
\ No newline at end of file
+};
diff --git a/docs/html-ndk/ndk/downloads/downloads_toc.cs b/docs/html/ndk/downloads/downloads_toc.cs
index dbe8aec..dbe8aec 100644
--- a/docs/html-ndk/ndk/downloads/downloads_toc.cs
+++ b/docs/html/ndk/downloads/downloads_toc.cs
diff --git a/docs/html-ndk/ndk/downloads/index.jd b/docs/html/ndk/downloads/index.jd
index 94e9ae9..94e9ae9 100644
--- a/docs/html-ndk/ndk/downloads/index.jd
+++ b/docs/html/ndk/downloads/index.jd
diff --git a/docs/html-ndk/ndk/downloads/revision_history.jd b/docs/html/ndk/downloads/revision_history.jd
index a32b814..a32b814 100644
--- a/docs/html-ndk/ndk/downloads/revision_history.jd
+++ b/docs/html/ndk/downloads/revision_history.jd
diff --git a/docs/html-ndk/ndk/guides/abis.jd b/docs/html/ndk/guides/abis.jd
index f4819b2..f4819b2 100644
--- a/docs/html-ndk/ndk/guides/abis.jd
+++ b/docs/html/ndk/guides/abis.jd
diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html/ndk/guides/android_mk.jd
index 47fefc3..47fefc3 100644
--- a/docs/html-ndk/ndk/guides/android_mk.jd
+++ b/docs/html/ndk/guides/android_mk.jd
diff --git a/docs/html-ndk/ndk/guides/application_mk.jd b/docs/html/ndk/guides/application_mk.jd
index 1294687..1294687 100644
--- a/docs/html-ndk/ndk/guides/application_mk.jd
+++ b/docs/html/ndk/guides/application_mk.jd
diff --git a/docs/html-ndk/ndk/guides/arch.jd b/docs/html/ndk/guides/arch.jd
index 3dafe8f..3dafe8f 100644
--- a/docs/html-ndk/ndk/guides/arch.jd
+++ b/docs/html/ndk/guides/arch.jd
diff --git a/docs/html-ndk/ndk/guides/build.jd b/docs/html/ndk/guides/build.jd
index 6286328..6286328 100644
--- a/docs/html-ndk/ndk/guides/build.jd
+++ b/docs/html/ndk/guides/build.jd
diff --git a/docs/html-ndk/ndk/guides/concepts.jd b/docs/html/ndk/guides/concepts.jd
index 0601f21..0601f21 100644
--- a/docs/html-ndk/ndk/guides/concepts.jd
+++ b/docs/html/ndk/guides/concepts.jd
diff --git a/docs/html-ndk/ndk/guides/cpp-support.jd b/docs/html/ndk/guides/cpp-support.jd
index 0074b80..0074b80 100644
--- a/docs/html-ndk/ndk/guides/cpp-support.jd
+++ b/docs/html/ndk/guides/cpp-support.jd
diff --git a/docs/html-ndk/ndk/guides/cpu-arm-neon.jd b/docs/html/ndk/guides/cpu-arm-neon.jd
index 1d12937..1d12937 100644
--- a/docs/html-ndk/ndk/guides/cpu-arm-neon.jd
+++ b/docs/html/ndk/guides/cpu-arm-neon.jd
diff --git a/docs/html-ndk/ndk/guides/cpu-features.jd b/docs/html/ndk/guides/cpu-features.jd
index b031909..b031909 100644
--- a/docs/html-ndk/ndk/guides/cpu-features.jd
+++ b/docs/html/ndk/guides/cpu-features.jd
diff --git a/docs/html-ndk/ndk/guides/debug.jd b/docs/html/ndk/guides/debug.jd
index 3c4da3b..3c4da3b 100644
--- a/docs/html-ndk/ndk/guides/debug.jd
+++ b/docs/html/ndk/guides/debug.jd
diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html/ndk/guides/guides_toc.cs
index 981eb51..981eb51 100644
--- a/docs/html-ndk/ndk/guides/guides_toc.cs
+++ b/docs/html/ndk/guides/guides_toc.cs
diff --git a/docs/html-ndk/ndk/guides/images/NDK_build_string.png b/docs/html/ndk/guides/images/NDK_build_string.png
index 338378b..338378b 100644
--- a/docs/html-ndk/ndk/guides/images/NDK_build_string.png
+++ b/docs/html/ndk/guides/images/NDK_build_string.png
diff --git a/docs/html-ndk/ndk/guides/images/NDK_build_string@2x.png b/docs/html/ndk/guides/images/NDK_build_string@2x.png
index 5ba3ce3..5ba3ce3 100644
--- a/docs/html-ndk/ndk/guides/images/NDK_build_string@2x.png
+++ b/docs/html/ndk/guides/images/NDK_build_string@2x.png
diff --git a/docs/html-ndk/ndk/guides/images/verification_screen.png b/docs/html/ndk/guides/images/verification_screen.png
index 91858ba..91858ba 100644
--- a/docs/html-ndk/ndk/guides/images/verification_screen.png
+++ b/docs/html/ndk/guides/images/verification_screen.png
diff --git a/docs/html-ndk/ndk/guides/images/verification_screen@2x.png b/docs/html/ndk/guides/images/verification_screen@2x.png
index 0d666c9..0d666c9 100644
--- a/docs/html-ndk/ndk/guides/images/verification_screen@2x.png
+++ b/docs/html/ndk/guides/images/verification_screen@2x.png
diff --git a/docs/html-ndk/ndk/guides/index.jd b/docs/html/ndk/guides/index.jd
index 465ce13..465ce13 100644
--- a/docs/html-ndk/ndk/guides/index.jd
+++ b/docs/html/ndk/guides/index.jd
diff --git a/docs/html-ndk/ndk/guides/libs.jd b/docs/html/ndk/guides/libs.jd
index ea607de..ea607de 100644
--- a/docs/html-ndk/ndk/guides/libs.jd
+++ b/docs/html/ndk/guides/libs.jd
diff --git a/docs/html-ndk/ndk/guides/mips.jd b/docs/html/ndk/guides/mips.jd
index 2b4eea4..2b4eea4 100644
--- a/docs/html-ndk/ndk/guides/mips.jd
+++ b/docs/html/ndk/guides/mips.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-build.jd b/docs/html/ndk/guides/ndk-build.jd
index 18ca2d8..18ca2d8 100644
--- a/docs/html-ndk/ndk/guides/ndk-build.jd
+++ b/docs/html/ndk/guides/ndk-build.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-gdb.jd b/docs/html/ndk/guides/ndk-gdb.jd
index b15e67e..b15e67e 100644
--- a/docs/html-ndk/ndk/guides/ndk-gdb.jd
+++ b/docs/html/ndk/guides/ndk-gdb.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-stack.jd b/docs/html/ndk/guides/ndk-stack.jd
index 46146cb..46146cb 100644
--- a/docs/html-ndk/ndk/guides/ndk-stack.jd
+++ b/docs/html/ndk/guides/ndk-stack.jd
diff --git a/docs/html-ndk/ndk/guides/prebuilts.jd b/docs/html/ndk/guides/prebuilts.jd
index 52eb437..52eb437 100644
--- a/docs/html-ndk/ndk/guides/prebuilts.jd
+++ b/docs/html/ndk/guides/prebuilts.jd
diff --git a/docs/html-ndk/ndk/guides/sample.jd b/docs/html/ndk/guides/sample.jd
index 18ca0b8..18ca0b8 100644
--- a/docs/html-ndk/ndk/guides/sample.jd
+++ b/docs/html/ndk/guides/sample.jd
diff --git a/docs/html-ndk/ndk/guides/setup.jd b/docs/html/ndk/guides/setup.jd
index 81a33c0..81a33c0 100644
--- a/docs/html-ndk/ndk/guides/setup.jd
+++ b/docs/html/ndk/guides/setup.jd
diff --git a/docs/html-ndk/ndk/guides/stable_apis.jd b/docs/html/ndk/guides/stable_apis.jd
index cad02ac..cad02ac 100644
--- a/docs/html-ndk/ndk/guides/stable_apis.jd
+++ b/docs/html/ndk/guides/stable_apis.jd
diff --git a/docs/html-ndk/ndk/guides/standalone_toolchain.jd b/docs/html/ndk/guides/standalone_toolchain.jd
index 3b6f7f1..3b6f7f1 100644
--- a/docs/html-ndk/ndk/guides/standalone_toolchain.jd
+++ b/docs/html/ndk/guides/standalone_toolchain.jd
diff --git a/docs/html-ndk/ndk/guides/x86-64.jd b/docs/html/ndk/guides/x86-64.jd
index c2f0d28..c2f0d28 100644
--- a/docs/html-ndk/ndk/guides/x86-64.jd
+++ b/docs/html/ndk/guides/x86-64.jd
diff --git a/docs/html-ndk/ndk/guides/x86.jd b/docs/html/ndk/guides/x86.jd
index 3a01b05..3a01b05 100644
--- a/docs/html-ndk/ndk/guides/x86.jd
+++ b/docs/html/ndk/guides/x86.jd
diff --git a/docs/html-ndk/ndk/index.jd b/docs/html/ndk/index.jd
index a88c15d..a88c15d 100644
--- a/docs/html-ndk/ndk/index.jd
+++ b/docs/html/ndk/index.jd
diff --git a/docs/html-ndk/ndk/reference/annotated.jd b/docs/html/ndk/reference/annotated.jd
index 8045f8d..8045f8d 100644
--- a/docs/html-ndk/ndk/reference/annotated.jd
+++ b/docs/html/ndk/reference/annotated.jd
diff --git a/docs/html-ndk/ndk/reference/asset__manager_8h.jd b/docs/html/ndk/reference/asset__manager_8h.jd
index 88d8dea..88d8dea 100644
--- a/docs/html-ndk/ndk/reference/asset__manager_8h.jd
+++ b/docs/html/ndk/reference/asset__manager_8h.jd
diff --git a/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd b/docs/html/ndk/reference/asset__manager__jni_8h.jd
index 8aace05..8aace05 100644
--- a/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd
+++ b/docs/html/ndk/reference/asset__manager__jni_8h.jd
diff --git a/docs/html-ndk/ndk/reference/bc_s.png b/docs/html/ndk/reference/bc_s.png
index fd162ea..fd162ea 100644
--- a/docs/html-ndk/ndk/reference/bc_s.png
+++ b/docs/html/ndk/reference/bc_s.png
diff --git a/docs/html-ndk/ndk/reference/bdwn.png b/docs/html/ndk/reference/bdwn.png
index 7c943f0..7c943f0 100644
--- a/docs/html-ndk/ndk/reference/bdwn.png
+++ b/docs/html/ndk/reference/bdwn.png
diff --git a/docs/html-ndk/ndk/reference/bitmap_8h.jd b/docs/html/ndk/reference/bitmap_8h.jd
index 518cab1..518cab1 100644
--- a/docs/html-ndk/ndk/reference/bitmap_8h.jd
+++ b/docs/html/ndk/reference/bitmap_8h.jd
diff --git a/docs/html-ndk/ndk/reference/classes.jd b/docs/html/ndk/reference/classes.jd
index e0ec721..e0ec721 100644
--- a/docs/html-ndk/ndk/reference/classes.jd
+++ b/docs/html/ndk/reference/classes.jd
diff --git a/docs/html-ndk/ndk/reference/closed.png b/docs/html/ndk/reference/closed.png
index e4e2b25..e4e2b25 100644
--- a/docs/html-ndk/ndk/reference/closed.png
+++ b/docs/html/ndk/reference/closed.png
diff --git a/docs/html-ndk/ndk/reference/configuration_8h.jd b/docs/html/ndk/reference/configuration_8h.jd
index 3f5f07c..3f5f07c 100644
--- a/docs/html-ndk/ndk/reference/configuration_8h.jd
+++ b/docs/html/ndk/reference/configuration_8h.jd
diff --git a/docs/html-ndk/ndk/reference/deprecated.jd b/docs/html/ndk/reference/deprecated.jd
index 0e69db6..0e69db6 100644
--- a/docs/html-ndk/ndk/reference/deprecated.jd
+++ b/docs/html/ndk/reference/deprecated.jd
diff --git a/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd b/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
index 025427a..025427a 100644
--- a/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
+++ b/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
diff --git a/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd b/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
index e42811e..e42811e 100644
--- a/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
+++ b/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
diff --git a/docs/html-ndk/ndk/reference/doxygen-dac.css b/docs/html/ndk/reference/doxygen-dac.css
index 96b6d84..96b6d84 100644
--- a/docs/html-ndk/ndk/reference/doxygen-dac.css
+++ b/docs/html/ndk/reference/doxygen-dac.css
diff --git a/docs/html-ndk/ndk/reference/doxygen.css b/docs/html/ndk/reference/doxygen.css
index 94f4bf2..94f4bf2 100644
--- a/docs/html-ndk/ndk/reference/doxygen.css
+++ b/docs/html/ndk/reference/doxygen.css
diff --git a/docs/html-ndk/ndk/reference/doxygen.png b/docs/html/ndk/reference/doxygen.png
index da7e8aa..da7e8aa 100644
--- a/docs/html-ndk/ndk/reference/doxygen.png
+++ b/docs/html/ndk/reference/doxygen.png
diff --git a/docs/html-ndk/ndk/reference/dynsections.js b/docs/html/ndk/reference/dynsections.js
index ed092c7..ed092c7 100644
--- a/docs/html-ndk/ndk/reference/dynsections.js
+++ b/docs/html/ndk/reference/dynsections.js
diff --git a/docs/html-ndk/ndk/reference/files.jd b/docs/html/ndk/reference/files.jd
index 1144d5b..1144d5b 100644
--- a/docs/html-ndk/ndk/reference/files.jd
+++ b/docs/html/ndk/reference/files.jd
diff --git a/docs/html-ndk/ndk/reference/ftv2blank.png b/docs/html/ndk/reference/ftv2blank.png
index 63c605b..63c605b 100644
--- a/docs/html-ndk/ndk/reference/ftv2blank.png
+++ b/docs/html/ndk/reference/ftv2blank.png
diff --git a/docs/html-ndk/ndk/reference/ftv2cl.png b/docs/html/ndk/reference/ftv2cl.png
index d660c7b..d660c7b 100644
--- a/docs/html-ndk/ndk/reference/ftv2cl.png
+++ b/docs/html/ndk/reference/ftv2cl.png
diff --git a/docs/html-ndk/ndk/reference/ftv2doc.png b/docs/html/ndk/reference/ftv2doc.png
index 7f92e54..7f92e54 100644
--- a/docs/html-ndk/ndk/reference/ftv2doc.png
+++ b/docs/html/ndk/reference/ftv2doc.png
diff --git a/docs/html-ndk/ndk/reference/ftv2folderclosed.png b/docs/html/ndk/reference/ftv2folderclosed.png
index 359f207..359f207 100644
--- a/docs/html-ndk/ndk/reference/ftv2folderclosed.png
+++ b/docs/html/ndk/reference/ftv2folderclosed.png
diff --git a/docs/html-ndk/ndk/reference/ftv2folderopen.png b/docs/html/ndk/reference/ftv2folderopen.png
index c5103ed..c5103ed 100644
--- a/docs/html-ndk/ndk/reference/ftv2folderopen.png
+++ b/docs/html/ndk/reference/ftv2folderopen.png
diff --git a/docs/html-ndk/ndk/reference/ftv2lastnode.png b/docs/html/ndk/reference/ftv2lastnode.png
index 63c605b..63c605b 100644
--- a/docs/html-ndk/ndk/reference/ftv2lastnode.png
+++ b/docs/html/ndk/reference/ftv2lastnode.png
diff --git a/docs/html-ndk/ndk/reference/ftv2link.png b/docs/html/ndk/reference/ftv2link.png
index 7f92e54..7f92e54 100644
--- a/docs/html-ndk/ndk/reference/ftv2link.png
+++ b/docs/html/ndk/reference/ftv2link.png
diff --git a/docs/html-ndk/ndk/reference/ftv2mlastnode.png b/docs/html/ndk/reference/ftv2mlastnode.png
index 9d1437d..9d1437d 100644
--- a/docs/html-ndk/ndk/reference/ftv2mlastnode.png
+++ b/docs/html/ndk/reference/ftv2mlastnode.png
diff --git a/docs/html-ndk/ndk/reference/ftv2mnode.png b/docs/html/ndk/reference/ftv2mnode.png
index 9d1437d..9d1437d 100644
--- a/docs/html-ndk/ndk/reference/ftv2mnode.png
+++ b/docs/html/ndk/reference/ftv2mnode.png
diff --git a/docs/html-ndk/ndk/reference/ftv2mo.png b/docs/html/ndk/reference/ftv2mo.png
index e2513ee..e2513ee 100644
--- a/docs/html-ndk/ndk/reference/ftv2mo.png
+++ b/docs/html/ndk/reference/ftv2mo.png
diff --git a/docs/html-ndk/ndk/reference/ftv2node.png b/docs/html/ndk/reference/ftv2node.png
index 63c605b..63c605b 100644
--- a/docs/html-ndk/ndk/reference/ftv2node.png
+++ b/docs/html/ndk/reference/ftv2node.png
diff --git a/docs/html-ndk/ndk/reference/ftv2ns.png b/docs/html/ndk/reference/ftv2ns.png
index c61a541..c61a541 100644
--- a/docs/html-ndk/ndk/reference/ftv2ns.png
+++ b/docs/html/ndk/reference/ftv2ns.png
diff --git a/docs/html-ndk/ndk/reference/ftv2plastnode.png b/docs/html/ndk/reference/ftv2plastnode.png
index a2fffb6..a2fffb6 100644
--- a/docs/html-ndk/ndk/reference/ftv2plastnode.png
+++ b/docs/html/ndk/reference/ftv2plastnode.png
diff --git a/docs/html-ndk/ndk/reference/ftv2pnode.png b/docs/html/ndk/reference/ftv2pnode.png
index a2fffb6..a2fffb6 100644
--- a/docs/html-ndk/ndk/reference/ftv2pnode.png
+++ b/docs/html/ndk/reference/ftv2pnode.png
diff --git a/docs/html-ndk/ndk/reference/ftv2splitbar.png b/docs/html/ndk/reference/ftv2splitbar.png
index 343046b..343046b 100644
--- a/docs/html-ndk/ndk/reference/ftv2splitbar.png
+++ b/docs/html/ndk/reference/ftv2splitbar.png
diff --git a/docs/html-ndk/ndk/reference/ftv2vertline.png b/docs/html/ndk/reference/ftv2vertline.png
index 63c605b..63c605b 100644
--- a/docs/html-ndk/ndk/reference/ftv2vertline.png
+++ b/docs/html/ndk/reference/ftv2vertline.png
diff --git a/docs/html-ndk/ndk/reference/functions.jd b/docs/html/ndk/reference/functions.jd
index fade0d5..fade0d5 100644
--- a/docs/html-ndk/ndk/reference/functions.jd
+++ b/docs/html/ndk/reference/functions.jd
diff --git a/docs/html-ndk/ndk/reference/functions_vars.jd b/docs/html/ndk/reference/functions_vars.jd
index 129c7ec..129c7ec 100644
--- a/docs/html-ndk/ndk/reference/functions_vars.jd
+++ b/docs/html/ndk/reference/functions_vars.jd
diff --git a/docs/html-ndk/ndk/reference/globals.jd b/docs/html/ndk/reference/globals.jd
index cb6dc11..cb6dc11 100644
--- a/docs/html-ndk/ndk/reference/globals.jd
+++ b/docs/html/ndk/reference/globals.jd
diff --git a/docs/html-ndk/ndk/reference/globals_defs.jd b/docs/html/ndk/reference/globals_defs.jd
index 8d04efb..8d04efb 100644
--- a/docs/html-ndk/ndk/reference/globals_defs.jd
+++ b/docs/html/ndk/reference/globals_defs.jd
diff --git a/docs/html-ndk/ndk/reference/globals_enum.jd b/docs/html/ndk/reference/globals_enum.jd
index 7fd396e..7fd396e 100644
--- a/docs/html-ndk/ndk/reference/globals_enum.jd
+++ b/docs/html/ndk/reference/globals_enum.jd
diff --git a/docs/html-ndk/ndk/reference/globals_eval.jd b/docs/html/ndk/reference/globals_eval.jd
index e1399c7..e1399c7 100644
--- a/docs/html-ndk/ndk/reference/globals_eval.jd
+++ b/docs/html/ndk/reference/globals_eval.jd
diff --git a/docs/html-ndk/ndk/reference/globals_eval_w.jd b/docs/html/ndk/reference/globals_eval_w.jd
index c996d30..c996d30 100644
--- a/docs/html-ndk/ndk/reference/globals_eval_w.jd
+++ b/docs/html/ndk/reference/globals_eval_w.jd
diff --git a/docs/html-ndk/ndk/reference/globals_func.jd b/docs/html/ndk/reference/globals_func.jd
index ae48353..ae48353 100644
--- a/docs/html-ndk/ndk/reference/globals_func.jd
+++ b/docs/html/ndk/reference/globals_func.jd
diff --git a/docs/html-ndk/ndk/reference/globals_type.jd b/docs/html/ndk/reference/globals_type.jd
index 99fa859..99fa859 100644
--- a/docs/html-ndk/ndk/reference/globals_type.jd
+++ b/docs/html/ndk/reference/globals_type.jd
diff --git a/docs/html-ndk/ndk/reference/globals_vars.jd b/docs/html/ndk/reference/globals_vars.jd
index e6bd2a4..e6bd2a4 100644
--- a/docs/html-ndk/ndk/reference/globals_vars.jd
+++ b/docs/html/ndk/reference/globals_vars.jd
diff --git a/docs/html-ndk/ndk/reference/globals_w.jd b/docs/html/ndk/reference/globals_w.jd
index b72e8c2..b72e8c2 100644
--- a/docs/html-ndk/ndk/reference/globals_w.jd
+++ b/docs/html/ndk/reference/globals_w.jd
diff --git a/docs/html-ndk/ndk/reference/group___asset.jd b/docs/html/ndk/reference/group___asset.jd
index c2f9067..c2f9067 100644
--- a/docs/html-ndk/ndk/reference/group___asset.jd
+++ b/docs/html/ndk/reference/group___asset.jd
diff --git a/docs/html-ndk/ndk/reference/group___bitmap.jd b/docs/html/ndk/reference/group___bitmap.jd
index 2f2b199..2f2b199 100644
--- a/docs/html-ndk/ndk/reference/group___bitmap.jd
+++ b/docs/html/ndk/reference/group___bitmap.jd
diff --git a/docs/html-ndk/ndk/reference/group___configuration.jd b/docs/html/ndk/reference/group___configuration.jd
index 708722e..708722e 100644
--- a/docs/html-ndk/ndk/reference/group___configuration.jd
+++ b/docs/html/ndk/reference/group___configuration.jd
diff --git a/docs/html-ndk/ndk/reference/group___input.jd b/docs/html/ndk/reference/group___input.jd
index 55db956..55db956 100644
--- a/docs/html-ndk/ndk/reference/group___input.jd
+++ b/docs/html/ndk/reference/group___input.jd
diff --git a/docs/html-ndk/ndk/reference/group___looper.jd b/docs/html/ndk/reference/group___looper.jd
index bc845f8..bc845f8 100644
--- a/docs/html-ndk/ndk/reference/group___looper.jd
+++ b/docs/html/ndk/reference/group___looper.jd
diff --git a/docs/html-ndk/ndk/reference/group___native_activity.jd b/docs/html/ndk/reference/group___native_activity.jd
index d0b2178..d0b2178 100644
--- a/docs/html-ndk/ndk/reference/group___native_activity.jd
+++ b/docs/html/ndk/reference/group___native_activity.jd
diff --git a/docs/html-ndk/ndk/reference/group___sensor.jd b/docs/html/ndk/reference/group___sensor.jd
index 41a0aec..41a0aec 100644
--- a/docs/html-ndk/ndk/reference/group___sensor.jd
+++ b/docs/html/ndk/reference/group___sensor.jd
diff --git a/docs/html-ndk/ndk/reference/group___storage.jd b/docs/html/ndk/reference/group___storage.jd
index e29303a..e29303a 100644
--- a/docs/html-ndk/ndk/reference/group___storage.jd
+++ b/docs/html/ndk/reference/group___storage.jd
diff --git a/docs/html-ndk/ndk/reference/index.jd b/docs/html/ndk/reference/index.jd
index 94bcb7a..94bcb7a 100644
--- a/docs/html-ndk/ndk/reference/index.jd
+++ b/docs/html/ndk/reference/index.jd
diff --git a/docs/html-ndk/ndk/reference/input_8h.jd b/docs/html/ndk/reference/input_8h.jd
index 855a346..855a346 100644
--- a/docs/html-ndk/ndk/reference/input_8h.jd
+++ b/docs/html/ndk/reference/input_8h.jd
diff --git a/docs/html-ndk/ndk/reference/keycodes_8h.jd b/docs/html/ndk/reference/keycodes_8h.jd
index 338a361..338a361 100644
--- a/docs/html-ndk/ndk/reference/keycodes_8h.jd
+++ b/docs/html/ndk/reference/keycodes_8h.jd
diff --git a/docs/html-ndk/ndk/reference/looper_8h.jd b/docs/html/ndk/reference/looper_8h.jd
index 9171631..9171631 100644
--- a/docs/html-ndk/ndk/reference/looper_8h.jd
+++ b/docs/html/ndk/reference/looper_8h.jd
diff --git a/docs/html-ndk/ndk/reference/modules.jd b/docs/html/ndk/reference/modules.jd
index 2da7307..2da7307 100644
--- a/docs/html-ndk/ndk/reference/modules.jd
+++ b/docs/html/ndk/reference/modules.jd
diff --git a/docs/html-ndk/ndk/reference/native__activity_8h.jd b/docs/html/ndk/reference/native__activity_8h.jd
index 147ffdb..147ffdb 100644
--- a/docs/html-ndk/ndk/reference/native__activity_8h.jd
+++ b/docs/html/ndk/reference/native__activity_8h.jd
diff --git a/docs/html-ndk/ndk/reference/native__window_8h.jd b/docs/html/ndk/reference/native__window_8h.jd
index 75f9469..75f9469 100644
--- a/docs/html-ndk/ndk/reference/native__window_8h.jd
+++ b/docs/html/ndk/reference/native__window_8h.jd
diff --git a/docs/html-ndk/ndk/reference/native__window__jni_8h.jd b/docs/html/ndk/reference/native__window__jni_8h.jd
index bffbc03..bffbc03 100644
--- a/docs/html-ndk/ndk/reference/native__window__jni_8h.jd
+++ b/docs/html/ndk/reference/native__window__jni_8h.jd
diff --git a/docs/html-ndk/ndk/reference/nav_f.png b/docs/html/ndk/reference/nav_f.png
index 5ceae87..5ceae87 100644
--- a/docs/html-ndk/ndk/reference/nav_f.png
+++ b/docs/html/ndk/reference/nav_f.png
diff --git a/docs/html-ndk/ndk/reference/nav_g.png b/docs/html/ndk/reference/nav_g.png
index 2093a23..2093a23 100644
--- a/docs/html-ndk/ndk/reference/nav_g.png
+++ b/docs/html/ndk/reference/nav_g.png
diff --git a/docs/html-ndk/ndk/reference/nav_h.png b/docs/html/ndk/reference/nav_h.png
index e619809..e619809 100644
--- a/docs/html-ndk/ndk/reference/nav_h.png
+++ b/docs/html/ndk/reference/nav_h.png
diff --git a/docs/html-ndk/ndk/reference/obb_8h.jd b/docs/html/ndk/reference/obb_8h.jd
index a856d4ee..a856d4ee 100644
--- a/docs/html-ndk/ndk/reference/obb_8h.jd
+++ b/docs/html/ndk/reference/obb_8h.jd
diff --git a/docs/html-ndk/ndk/reference/open.png b/docs/html/ndk/reference/open.png
index 7e740cc..7e740cc 100644
--- a/docs/html-ndk/ndk/reference/open.png
+++ b/docs/html/ndk/reference/open.png
diff --git a/docs/html-ndk/ndk/reference/pages.jd b/docs/html/ndk/reference/pages.jd
index 2d7ece8..2d7ece8 100644
--- a/docs/html-ndk/ndk/reference/pages.jd
+++ b/docs/html/ndk/reference/pages.jd
diff --git a/docs/html-ndk/ndk/reference/rect_8h.jd b/docs/html/ndk/reference/rect_8h.jd
index 85787b5..85787b5 100644
--- a/docs/html-ndk/ndk/reference/rect_8h.jd
+++ b/docs/html/ndk/reference/rect_8h.jd
diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html/ndk/reference/reference_toc.cs
index 8ddb864..8ddb864 100644
--- a/docs/html-ndk/ndk/reference/reference_toc.cs
+++ b/docs/html/ndk/reference/reference_toc.cs
diff --git a/docs/html-ndk/ndk/reference/sensor_8h.jd b/docs/html/ndk/reference/sensor_8h.jd
index a537f4f..a537f4f 100644
--- a/docs/html-ndk/ndk/reference/sensor_8h.jd
+++ b/docs/html/ndk/reference/sensor_8h.jd
diff --git a/docs/html-ndk/ndk/reference/storage__manager_8h.jd b/docs/html/ndk/reference/storage__manager_8h.jd
index 6048d84..6048d84 100644
--- a/docs/html-ndk/ndk/reference/storage__manager_8h.jd
+++ b/docs/html/ndk/reference/storage__manager_8h.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd b/docs/html/ndk/reference/struct_a_heart_rate_event.jd
index 1cd2a2d..1cd2a2d 100644
--- a/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd
+++ b/docs/html/ndk/reference/struct_a_heart_rate_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd b/docs/html/ndk/reference/struct_a_meta_data_event.jd
index 352b5ba..352b5ba 100644
--- a/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd
+++ b/docs/html/ndk/reference/struct_a_meta_data_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity.jd b/docs/html/ndk/reference/struct_a_native_activity.jd
index 6d8124b..6d8124b 100644
--- a/docs/html-ndk/ndk/reference/struct_a_native_activity.jd
+++ b/docs/html/ndk/reference/struct_a_native_activity.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd b/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
index 45b8e5e..45b8e5e 100644
--- a/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd
+++ b/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd b/docs/html/ndk/reference/struct_a_native_window___buffer.jd
index a2008fd..a2008fd 100644
--- a/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd
+++ b/docs/html/ndk/reference/struct_a_native_window___buffer.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_rect.jd b/docs/html/ndk/reference/struct_a_rect.jd
index 4b9bb67..4b9bb67 100644
--- a/docs/html-ndk/ndk/reference/struct_a_rect.jd
+++ b/docs/html/ndk/reference/struct_a_rect.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd b/docs/html/ndk/reference/struct_a_sensor_event.jd
index 3c6e49d..3c6e49d 100644
--- a/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd
+++ b/docs/html/ndk/reference/struct_a_sensor_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd b/docs/html/ndk/reference/struct_a_sensor_vector.jd
index 397ad6d..397ad6d 100644
--- a/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd
+++ b/docs/html/ndk/reference/struct_a_sensor_vector.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd b/docs/html/ndk/reference/struct_a_uncalibrated_event.jd
index 985b0b9..985b0b9 100644
--- a/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd
+++ b/docs/html/ndk/reference/struct_a_uncalibrated_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd b/docs/html/ndk/reference/struct_android_bitmap_info.jd
index f995b56..f995b56 100644
--- a/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd
+++ b/docs/html/ndk/reference/struct_android_bitmap_info.jd
diff --git a/docs/html-ndk/ndk/reference/sync_off.png b/docs/html/ndk/reference/sync_off.png
index b856624..b856624 100644
--- a/docs/html-ndk/ndk/reference/sync_off.png
+++ b/docs/html/ndk/reference/sync_off.png
diff --git a/docs/html-ndk/ndk/reference/sync_on.png b/docs/html/ndk/reference/sync_on.png
index e5044af..e5044af 100644
--- a/docs/html-ndk/ndk/reference/sync_on.png
+++ b/docs/html/ndk/reference/sync_on.png
diff --git a/docs/html-ndk/ndk/reference/tab_a.png b/docs/html/ndk/reference/tab_a.png
index 170a784..170a784 100644
--- a/docs/html-ndk/ndk/reference/tab_a.png
+++ b/docs/html/ndk/reference/tab_a.png
diff --git a/docs/html-ndk/ndk/reference/tab_b.png b/docs/html/ndk/reference/tab_b.png
index 7774499..7774499 100644
--- a/docs/html-ndk/ndk/reference/tab_b.png
+++ b/docs/html/ndk/reference/tab_b.png
diff --git a/docs/html-ndk/ndk/reference/tab_h.png b/docs/html/ndk/reference/tab_h.png
index e1dddef..e1dddef 100644
--- a/docs/html-ndk/ndk/reference/tab_h.png
+++ b/docs/html/ndk/reference/tab_h.png
diff --git a/docs/html-ndk/ndk/reference/tab_s.png b/docs/html/ndk/reference/tab_s.png
index 3dc07b0..3dc07b0 100644
--- a/docs/html-ndk/ndk/reference/tab_s.png
+++ b/docs/html/ndk/reference/tab_s.png
diff --git a/docs/html-ndk/ndk/reference/tabs.css b/docs/html/ndk/reference/tabs.css
index 71145bb..71145bb 100644
--- a/docs/html-ndk/ndk/reference/tabs.css
+++ b/docs/html/ndk/reference/tabs.css
diff --git a/docs/html-ndk/ndk/reference/window_8h.jd b/docs/html/ndk/reference/window_8h.jd
index 39e01dc..39e01dc 100644
--- a/docs/html-ndk/ndk/reference/window_8h.jd
+++ b/docs/html/ndk/reference/window_8h.jd
diff --git a/docs/html-ndk/ndk/samples/index.jd b/docs/html/ndk/samples/index.jd
index 6b2cd16..6b2cd16 100644
--- a/docs/html-ndk/ndk/samples/index.jd
+++ b/docs/html/ndk/samples/index.jd
diff --git a/docs/html-ndk/ndk/samples/sample_hellojni.jd b/docs/html/ndk/samples/sample_hellojni.jd
index fa61b28..fa61b28 100644
--- a/docs/html-ndk/ndk/samples/sample_hellojni.jd
+++ b/docs/html/ndk/samples/sample_hellojni.jd
diff --git a/docs/html-ndk/ndk/samples/sample_na.jd b/docs/html/ndk/samples/sample_na.jd
index a706be5..a706be5 100644
--- a/docs/html-ndk/ndk/samples/sample_na.jd
+++ b/docs/html/ndk/samples/sample_na.jd
diff --git a/docs/html-ndk/ndk/samples/sample_teapot.jd b/docs/html/ndk/samples/sample_teapot.jd
index 97708a7..97708a7 100644
--- a/docs/html-ndk/ndk/samples/sample_teapot.jd
+++ b/docs/html/ndk/samples/sample_teapot.jd
diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html/ndk/samples/samples_toc.cs
index 92266b1..92266b1 100644
--- a/docs/html-ndk/ndk/samples/samples_toc.cs
+++ b/docs/html/ndk/samples/samples_toc.cs
diff --git a/docs/html-ndk/ndk/samples/walkthroughs.jd b/docs/html/ndk/samples/walkthroughs.jd
index 88ceb56..88ceb56 100644
--- a/docs/html-ndk/ndk/samples/walkthroughs.jd
+++ b/docs/html/ndk/samples/walkthroughs.jd
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 02beefd..9a83450 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -31,16 +31,16 @@ studio.win_notools_exe_checksum=ae09797db2537afb572a00b7eacc292bb66d539e
 
 
 sdk.linux_download=android-sdk_r24.3.2-linux.tgz
-sdk.linux_bytes=309563606
-sdk.linux_checksum=98e70ce403fea2e24e90103395d418feb3a9b7e8
+sdk.linux_bytes=309138263
+sdk.linux_checksum=4a10e62c5d88fd6c2a69db12348cbe168228b98f
 
 sdk.mac_download=android-sdk_r24.3.2-macosx.zip
-sdk.mac_bytes=98259310
-sdk.mac_checksum=aa9aef30ff27358118318d82414b1481625faf2a
+sdk.mac_bytes=98329772
+sdk.mac_checksum=8609b92e26e9bd5796f771138c6b222b6c0cb474
 
 sdk.win_download=android-sdk_r24.3.2-windows.zip
-sdk.win_bytes=187214094
-sdk.win_checksum=c33a63a955bb448ee550710a764ba18c37cb58d6
+sdk.win_bytes=187488291
+sdk.win_checksum=bcfe3c41ea7e33a29ad6f358adbdf977008be80a
 
 sdk.win_installer=installer_r24.3.2-windows.exe
 sdk.win_installer_bytes=139471724
diff --git a/docs/html/training/enterprise/index.jd b/docs/html/training/enterprise/index.jd
index fce09b9..d54607c 100644
--- a/docs/html/training/enterprise/index.jd
+++ b/docs/html/training/enterprise/index.jd
@@ -6,10 +6,10 @@ page.article=true
 
 @jd:body
 
-<img src="{@docRoot}images/enterprise/work-launcher.png"
-  width="300"
-  style="float:right;margin:0 0 20px 20px"
-  alt="Android for Work apps in a managed profile">
+<iframe width="448" height="252"
+    src="//www.youtube.com/embed/jQWB_-o1kz4?autohide=1&amp;showinfo=0"
+    frameborder="0" allowfullscreen=""
+    style="float: right; margin: 0 0 20px 20px;"></iframe>
 
 <p>
   The Android framework provides features to support the security, data separation, and
@@ -32,7 +32,6 @@ page.article=true
   the enterprise environment or build enterprise-specific solutions.
 </p>
 
-
 <h2 id="apps">App Development for Enterprises</h2>
 
 <p>
@@ -44,7 +43,7 @@ page.article=true
 <div class="dynamic-grid">
   <div class="resource-widget resource-flow-layout landing col-12"
     data-query="collection:training/work/apps"
-    data-cardSizes="9x3"
+    data-cardSizes="6x6"
     data-maxResults="6">
   </div>
 </div>
@@ -60,7 +59,7 @@ page.article=true
 <div class="dynamic-grid">
   <div class="resource-widget resource-flow-layout landing col-12"
     data-query="collection:training/work/admin"
-    data-cardSizes="9x3"
+    data-cardSizes="6x6"
     data-maxResults="4">
   </div>
 </div>