Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of b29a938c to nyc-dev

Browse Source 
am: 473738d6d3

Change-Id: I49bf89f5ed1696ec85c6b15559a97df2a9bcae04
This commit is contained in:
Joe Fernandez
2016-08-04 00:56:39 +00:00
committed by android-build-merger
parent 1584d5d6e2 473738d6d3
commit 11d8a4c49e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/topic/arc/_book.yaml
View File

@@ -6,4 +6,4 @@ toc:
- title: Loading Apps on Chromebooks - title: Loading Apps on Chromebooks
path: /topic/arc/sideload.html path: /topic/arc/sideload.html
- title: Chrome OS Device Support for Apps - title: Chrome OS Device Support for Apps
path: /topic/arc/device-support.html path: /topic/arc/device-support.html