resolve merge conflicts of bd96855 to nyc-dev

Change-Id: Ic07598d00f7ea59f800c260ba448a16df4e397dd
2016-05-17 17:06:52 -07:00
parent 0fda52b92e bd96855929
commit 61dbd85a9e
3 changed files with 2805 additions and 2799 deletions
--- a/docs/html/topic/libraries/_book.yaml
+++ b/docs/html/topic/libraries/_book.yaml
@@ -6,6 +6,8 @@ toc:
    path: /topic/libraries/support-library/features.html
  - title: Setup
    path: /topic/libraries/support-library/setup.html
+  - title: Revision History
+    path: /topic/libraries/support-library/revisions.html

 - title: Data Binding Library
  path: /topic/libraries/data-binding/index.html
--- a/docs/html/topic/libraries/support-library/index.jd
+++ b/docs/html/topic/libraries/support-library/index.jd
--- a/docs/html/topic/libraries/support-library/revisions.jd
+++ b/docs/html/topic/libraries/support-library/revisions.jd