Commit Graph

16 Commits

Author SHA1 Message Date
Qiwen Zhao 5726fec530 Merge commit 'e866294e' into lmp-dev-plus-aosp
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
2014-09-18 12:19:51 -07:00
Clay Murphy d9e4b52a38 Docs: Replacing s.a.c. Android logo to match other sites.
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-09-18 16:44:21 +00:00
Clay Murphy 6bc672aa96 Docs: Replacing s.a.c. Android logo to match other sites.
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-06-24 11:32:56 -07:00
Clay Murphy 34306a6dc2 am 25f47659: am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
* commit '25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
  Docs: replacing analytics ID from D.A.C. Bug: 11476435
2014-03-11 18:52:28 +00:00
Clay Murphy 231f3d03ae Docs: replacing analytics ID from D.A.C.
Bug: 11476435

Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
2014-03-05 12:20:46 -08:00
Dirk Dougherty 5ca1c0d9fc am 25eec8bf: am d8bb1b11: am acecb040: Add jd_lists_unified.cs to sac, pdk, ds templates.
* commit '25eec8bf3ec712c6628992e217b9eea4cb8ac5f7':
  Add jd_lists_unified.cs to sac, pdk, ds templates.
2013-11-20 11:31:02 -08:00
Dirk Dougherty acecb04046 Add jd_lists_unified.cs to sac, pdk, ds templates.
Change-Id: I4d3216018932e0482e20f01c944429e0a7ccee65
2013-11-20 11:18:19 -08:00
Clay Murphy 4c01694fe0 Docs: replacing analytics ID from D.A.C.
Bug: 11476435

Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
2013-11-13 17:46:29 -08:00
Brett Chabot 7678688f37 Output annotations in sdk package-summary docs.
Bug 10749552
Bug 6333357

Change-Id: I57e97ee69d41bb8df5ea371a766ebb7e0602ff90
2013-10-15 20:41:49 -07:00
Dirk Dougherty 8c01be686c am ccc15faf: am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit 'ccc15faf56ad46f973800cb6bd41b4634b9192a0':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:33:58 -07:00
Dirk Dougherty 4c2dfcfd6d Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
2013-07-08 16:05:05 -07:00
Clay Murphy 49d8686488 docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
Bug: 8905394

Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
2013-06-05 12:06:06 -07:00
Robert Ly d458f0a91f fix links
Change-Id: Ied393fa6ba3c2e9240dd8d2af9633252015a098b
2013-05-08 14:59:46 -07:00
Robert Ly c942e8799e fix sac search
Change-Id: If34b834f5c7bca09bc59feb3f9eeb1a004209e23
2013-05-07 12:09:01 -07:00
Robert Ly dbfc4bbc95 sac template fixes
Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30
2013-04-18 11:35:16 -07:00
Robert Ly a4d2d0ef55 s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
2013-04-09 11:27:34 -07:00