Chris Craik a4316e962c Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29 ...

am: 6badb0fb54

* commit '6badb0fb54a72026dfe5d04e2556637b116a9c91':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ie324dd06265e48abe229c101f638e98e906bb199

2016-05-19 18:45:25 +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

Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1

2016-05-15 03:11:46 +00:00

samples

…

topics

Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29

2016-05-19 18:45:25 +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

…