summaryrefslogtreecommitdiffstats
path: root/docs/html/images
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Doc change: More changes to distribute files, Google Services page update.Dirk Dougherty2015-05-1410-0/+0
| | | | | | | | | | | | | | | | Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
* | | | resolved conflicts for merge of 45fed517 to mnc-devDirk Dougherty2015-05-1314-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74
| * | | Doc change: add new engagement and other distribute files.Dirk Dougherty2015-05-1214-0/+0
| | | | | | | | | | | | | | | | Change-Id: I1c80d134b6637db9f763b6a587cdc5817a66b9be
* | | | am d3b2d050: am 674b1fcb: Doc change: Update cards and landing contents.Dirk Dougherty2015-05-0918-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd3b2d0502dd30039789f2a2b6380a4344fdc865e': Doc change: Update cards and landing contents.
| * | | Doc change: Update cards and landing contents.Dirk Dougherty2015-05-0818-0/+0
| | | | | | | | | | | | | | | | Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
* | | | am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and ↵Dirk Dougherty2015-05-0540-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | header/footer designs." into mnc-preview-docs * commit '08c72b91bedefbebe0547646544cd875c1062af0': Doc change: merge landing page and header/footer designs.
| * | | Doc change: merge landing page and header/footer designs.Dirk Dougherty2015-05-0340-0/+0
| |/ / | | | | | | | | | Change-Id: Ic2f603c0215f8dadac2dfa4b871b22b2f9a027e5
* | | resolved conflicts for merge of edf44562 to mnc-devRich Slogar2015-04-305-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
| * | am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-305-0/+0
| |\ \ | | |/ | | | | | | | | | * commit '2a3aa2d343820be9e05101a25b955d525e9bfa54': docs: studio 1.2 updates
| | * docs: studio 1.2 updatesRich Slogar2015-04-295-0/+0
| | | | | | | | | | | | Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
* | | am 2a8ef256: am 495227aa: Doc change: update dff image.Dirk Dougherty2015-04-251-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '2a8ef2563042e2db93960ace529a2986c289d3dc': Doc change: update dff image.
| * | Doc change: update dff image.Dirk Dougherty2015-04-251-0/+0
| | | | | | | | | | | | | | | | | | Bug-id: 20251587 Change-Id: I25d59c8a66c548a13e699c25e79cd4a23d2cd330
| * | Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docsJoe Fernandez2015-04-192-0/+0
| |\ \
| | * | docs: studio remove gradle tasks dialogRich Slogar2015-04-192-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e (cherry picked from commit caa15d49f968720f51a096b93e0412e97db269a1)
| * | | docs: hierarchyviewer updatesRich Slogar2015-04-192-0/+0
| |/ / | | | | | | | | | | | | | | | | | | b/19955159 Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715 (cherry picked from commit f9f81b49d04ba5beb5a360265e808a7d6e9ed269)
* | | am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am ↵Rich Slogar2015-04-172-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs * commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0': docs: studio remove gradle tasks dialog
| * | Merge "docs: studio remove gradle tasks dialog" into lmp-docsRich Slogar2015-04-172-0/+0
| |\ \
| | * | docs: studio remove gradle tasks dialogRich Slogar2015-04-152-0/+0
| | | | | | | | | | | | | | | | Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
* | | | am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am ↵Rich Slogar2015-04-172-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs * commit '58befba6ac88b4216cac43f97a456d1119dcb972': docs: hierarchyviewer updates
| * | | Merge "docs: hierarchyviewer updates" into lmp-docsRich Slogar2015-04-172-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | docs: hierarchyviewer updatesRich Slogar2015-04-152-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | b/19955159 Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
* | | | am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am ↵Dirk Dougherty2015-04-142-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs * commit '38544901e6aa6934b032303be314a92dcde662f3': Doc change: add new pages for Designed for Families.
| * | | Doc change: add new pages for Designed for Families.Dirk Dougherty2015-04-132-0/+0
| |/ / | | | | | | | | | Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
* | | am bb18c2d4: am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge ↵Scott Rowe2015-04-024-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | "docs: Building Live TV Apps" into lmp-docs * commit 'bb18c2d4ab7ed592810eb9031a892fb4748ecadc': docs: Building Live TV Apps
| * | docs: Building Live TV AppsScott Rowe2015-04-014-0/+0
| |/ | | | | | | Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
* | am ecef2964: am 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am ↵Joe Fernandez2015-03-192-0/+0
|\ \ | |/ | | | | | | | | | | 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs * commit 'ecef296420d9374626134bb32f63b50757e00e71': docs: Add distribution guidelines and update quality checklist for Android Auto.
| * Merge "docs: Add distribution guidelines and update quality checklist for ↵Joe Fernandez2015-03-182-0/+0
| |\ | | | | | | | | | Android Auto." into lmp-docs
| | * docs: Add distribution guidelines and update quality checklistLuan Nguyen2015-03-162-0/+0
| | | | | | | | | | | | | | | | | | for Android Auto. Change-Id: Ie504fee6ee32fd24d332ff65004a6b711e7fe3ec
* | | am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am ↵Rich Slogar2015-03-134-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs * commit '93d44992ecf41b8169391005f7d3d219785eef90': docs: build image updates
| * | Merge "docs: build image updates" into lmp-docsRich Slogar2015-03-124-0/+0
| |\ \
| | * | docs: build image updatesRich Slogar2015-02-254-0/+0
| | | | | | | | | | | | | | | | Change-Id: I9bc252b2f3a43085b69b1177242cc8b1fc0e0662
* | | | am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am ↵Eric Gilmore2015-03-102-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs * commit '89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b': Reworking geofencing training to new API and sample.
| * | | Merge "Reworking geofencing training to new API and sample." into lmp-docsEric Gilmore2015-03-062-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Reworking geofencing training to new API and sample.Eric Gilmore2015-03-062-0/+0
| | | | | | | | | | | | | | | | Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
* | | | am 20928cae: am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am ↵Joe Fernandez2015-02-251-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs * commit '20928caef4c4f90793408afc91e6d48f0551b4a5': docs: Android for Work developer landing page
| * | | docs: Android for Work developer landing pageJoe Fernandez2015-02-241-0/+0
| |/ / | | | | | | | | | Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
* | | am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am ↵Rich Slogar2015-02-181-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 755c5d88: am 56375d90: docs: lint inspection updates * commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6': docs: lint inspection updates
| * | docs: lint inspection updatesRich Slogar2015-02-181-0/+0
| | | | | | | | | | | | Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
* | | am 85b066cb: am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am ↵Rich Sloager2015-02-182-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc * commit '85b066cb8a760ad1a20f7f758c3b7947aea96231': Revert "docs: studio proxy setup"
| * | Merge "Revert "docs: studio proxy setup"" into lmp-docsRich Sloager2015-02-172-0/+0
| |\ \
| | * | Revert "docs: studio proxy setup"Rich Sloager2015-02-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024. Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
* | | | resolved conflicts for merge of 1c131eeb to masterChris Banes2015-02-184-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
| * | | Merge "docs: studio mipmap update" into lmp-docsRich Slogar2015-02-174-0/+0
| |\ \ \
| | * | | docs: studio mipmap updateRich Slogar2015-02-134-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
* | | | | am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am ↵Rich Slogar2015-02-182-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 * commit '65d12bf7f14ff7568cc3011793e219391f9c3d29': docs: studio proxy setting setup docs: studio proxy setup
| * | | | Merge changes If3a78fc7,Ifbe3f03a into lmp-docsRich Slogar2015-02-172-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * changes: docs: studio proxy setting setup docs: studio proxy setup
| | * | | docs: studio proxy setupRich Slogar2015-01-262-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbe3f03a47cfb1a59ade4e2fb678a51a7256fdb4
* | | | | am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer ↵Oliver Woodman2015-02-171-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide." into lmp-docs automerge: a40eb5d automerge: 1289d52 automerge: 6a71e81 * commit '6a71e814a3207fbe2cffe0650a1c37688f2aa62e': Update ExoPlayer developer guide.
| * | | | Update ExoPlayer developer guide.Oliver Woodman2015-02-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minimal update, just to fix things that are broken or no longer make sense as of the v1.2.0 release. Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
* | | | | am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various ↵Luan Nguyen2015-02-103-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with incorrect code samples." into lmp-docs automerge: 6ee9018 automerge: c6ec799 * commit 'c6ec79913fbcf5b915ed55f3cc7b49690ee997f9': docs: Fix various issues with incorrect code samples.