Offer trampoline to help articles. am: 4f425c890b

am: aaaf41d982

Change-Id: Ib10ccc2348f1fa9d5687941c38ca7f28fcb0465e

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values/bools.xml
index 233c13f,8958a6e..1cbe1da
--- 1/res/values/bools.xml
--- 2/res/values/bools.xml
+++ b/res/values/bools.xml
@@@ -41,9 -41,9 +41,12 @@@
      <!-- Whether none security option is hide or not  (country specific). -->
      <bool name="config_hide_none_security_option">false</bool>
  
 +    <!-- Whether swipe security option is hidden or not -->
 +    <bool name="config_hide_swipe_security_option">false</bool>
 +
      <!--Whether the storage manager exists. -->
      <bool name="config_has_storage_manager">false</bool>
+ 
+     <!--Whether help links are defined. -->
+     <bool name="config_has_help">false</bool>
  </resources>

diff --cc res/values/strings.xml
Simple merge