resolve merge conflicts of bd96855 to nyc-dev (61dbd85a) · Commits · e / os / android_frameworks_base

docs/html/topic/libraries/_book.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

+6 −2799

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+2797 −0

File added.

Preview size limit exceeded, changes collapsed.