commit c168b6e27aa48c1d5552ed9143eeb00d2c9860a5
author Ying Wang <wangying@google.com> Tue Sep 30 16:41:08 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 30 16:41:08 2014 +0000
tree d08f8bfb8c0951014a4cb8a7751c424714b3a272
parent f388993a8f5690cef3ea65f6982e343c53e96941
parent 194418c3e19614cb9bcc5d550c20f597b44a4a1b

Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index fbc24b0..0820885 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -110,7 +110,9 @@
         v4 \
         v7/gridlayout \
         v7/appcompat \
+        v7/cardview \
         v7/mediarouter \
+        v7/palette \
         v7/recyclerview \
         v8/renderscript \
         v13 \

tools/droiddoc/templates-sdk/docpage.cs

diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index 4d1404b..7d872bc 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -195,8 +195,8 @@
 <?cs include:"trailer.cs" ?>
   <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
   <script src="<?cs var:toroot ?>jd_lists_unified.js?v=2" type="text/javascript"></script>
-  <script src="<?cs var:toroot ?>jd_extras.js?v=2" type="text/javascript"></script>
-  <script src="<?cs var:toroot ?>jd_collections.js?v=2" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_extras.js?v=3" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_collections.js?v=3" type="text/javascript"></script>
   <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=2" type="text/javascript"></script>
 
 </body>