resolve merge conflicts of b29a938c to nyc-dev

am: 473738d6d3 Change-Id: I4691daf7c5fac223afa133f15637c01c72194216
2016-08-04 00:45:09 +00:00
parent ed042c00e0 473738d6d3
commit 0ab145df22
1 changed files with 1 additions and 1 deletions
--- a/docs/html/topic/arc/_book.yaml
+++ b/docs/html/topic/arc/_book.yaml
@@ -6,4 +6,4 @@ toc:
 - title: Loading Apps on Chromebooks
  path: /topic/arc/sideload.html
 - title: Chrome OS Device Support for Apps
-  path: /topic/arc/device-support.html
+  path: /topic/arc/device-support.html