Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev am: f3f5d79210

am: 794d9a2e91

* commit '794d9a2e9133b9ab902f4ccd6a0cd1109a933ea8':
  docs: Creating new support library revision history page

Change-Id: I43b02066f642eac7eb6656c7b587b6cf26cc37f3
This commit is contained in:
Andrew Solovay
2016-05-18 01:10:41 +00:00
committed by android-build-merger
3 changed files with 2805 additions and 2799 deletions

View File

@@ -6,6 +6,8 @@ toc:
path: /topic/libraries/support-library/features.html path: /topic/libraries/support-library/features.html
- title: Setup - title: Setup
path: /topic/libraries/support-library/setup.html path: /topic/libraries/support-library/setup.html
- title: Revision History
path: /topic/libraries/support-library/revisions.html
- title: Data Binding Library - title: Data Binding Library
path: /topic/libraries/data-binding/index.html path: /topic/libraries/data-binding/index.html

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff