Andrew Solovay 8363a70024 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 ...

am: dc4cd59183

* commit 'dc4cd59183fec0d5dc5661e6015f856f66d65ce9':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed

2016-05-12 18:48:50 +00:00

..

appendix

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

components

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

practices

Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237

2016-04-27 03:11:53 +00:00

samples

…

topics

Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571

2016-05-12 18:48:50 +00:00

webapps

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

_book.yaml

docs: Fixing bad URL in libraries TOC

2016-05-04 16:20:01 -07:00

guide_toc.cs

Add Complex XML Resources guide to docs

2016-04-28 13:21:23 -07:00

index.jd

…