Commit Graph

163632 Commits

Author SHA1 Message Date
Deepanshu Gupta
8f022fd323 am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
  Set forceFramework correctly for included layouts.
2015-02-23 19:22:31 +00:00
Deepanshu Gupta
5ed4fc9efd am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.
2015-02-23 19:15:57 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
2015-02-23 19:03:29 +00:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
David Friedman
84e40b1f33 am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48':
  Fixes several typos.
2015-02-23 18:33:08 +00:00
David Friedman
2c6894685d am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit 'fcbc842878df5fbe3d8a62add407bb512179e28a':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:33:04 +00:00
David Friedman
d77380b856 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.
2015-02-23 18:26:10 +00:00
David Friedman
fcbc842878 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:26:06 +00:00
David Friedman
3570268bcf am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.
2015-02-23 18:20:37 +00:00
David Friedman
f066c2358d am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:20:32 +00:00
David Friedman
09e9076ddf am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.
2015-02-23 18:13:36 +00:00
David Friedman
18c8a35fa4 am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
2015-02-23 17:26:12 +00:00
Geoff Mendal
87809139d2 am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '4c58f1271d60554375d85598134fdc821563e78a':
  Import translations. DO NOT MERGE
2015-02-23 16:41:22 +00:00
Geoff Mendal
4c58f1271d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 16:34:42 +00:00
Geoff Mendal
1df5df2b77 Import translations. DO NOT MERGE
Change-Id: Ia406db95dc51e21b462e9de8451ad221023447fd
Auto-generated-cl: translation import
2015-02-23 07:47:09 -08:00
Geoff Mendal
84cd5f64c3 am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'e74331dc0ef5393115a4381e98b860d80ddfe2a7':
  Import translations. DO NOT MERGE
2015-02-23 14:26:47 +00:00
Geoff Mendal
5f28b32ce6 am dc82f4ce: (-s ours) Import translations. DO NOT MERGE
* commit 'dc82f4ce1c77066f07ddf06c5fe923350a86b4e9':
  Import translations. DO NOT MERGE
2015-02-23 14:20:49 +00:00
Geoff Mendal
e74331dc0e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 14:20:07 +00:00
Geoff Mendal
954759b363 Import translations. DO NOT MERGE
Change-Id: I06d6d60e4d09ad158c554e6c8e3865f06895db56
Auto-generated-cl: translation import
2015-02-23 06:18:26 -08:00
Geoff Mendal
dc82f4ce1c Import translations. DO NOT MERGE
Change-Id: I470855ce547f2e302f9ad27a3c08ad40d8fd0048
Auto-generated-cl: translation import
2015-02-23 06:12:16 -08:00
Geoff Mendal
5211dfd5b4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-23 13:52:35 +00:00
Geoff Mendal
1f4e01f2b3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-23 13:52:02 +00:00
Geoff Mendal
52a260b4b4 Import translations. DO NOT MERGE
Change-Id: I44a58cca048a4a35b5f815c4be9bd1ca1bfad1b7
Auto-generated-cl: translation import
2015-02-23 05:50:48 -08:00
Geoff Mendal
5f159d65c0 Import translations. DO NOT MERGE
Change-Id: Ib78275fac19887a479cacb3797c3ddb9e2d1cb0e
Auto-generated-cl: translation import
2015-02-23 07:50:45 -06:00
Geoff Mendal
7aaaacc1d1 Import translations. DO NOT MERGE
Change-Id: I35b9d89969207b2ce627e5e7af517e6f8f519650
Auto-generated-cl: translation import
2015-02-23 05:44:35 -08:00
Rich Slogar
5f21a4dc7d am cd0425d6: am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit 'cd0425d6e28ffba9bf256159bdb9ff883b09f638':
  docs: android plugin revisions page v2
2015-02-21 01:29:13 +00:00
Rich Slogar
cd0425d6e2 am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit 'aba93780b47472f411737744957af00ae8d12220':
  docs: android plugin revisions page v2
2015-02-21 01:09:58 +00:00
Rich Slogar
aba93780b4 am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
  docs: android plugin revisions page v2
2015-02-21 01:04:52 +00:00
Rich Slogar
5b60b1a040 am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit 'a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
  docs: android plugin revisions page v2
2015-02-21 00:58:17 +00:00
Rich Slogar
a91f6d0003 am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2
2015-02-21 00:51:05 +00:00
Rich Slogar
4a99918b40 Merge "docs: android plugin revisions page v2" into lmp-docs 2015-02-21 00:44:50 +00:00
David Friedman
c03e7dd850 Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c
2015-02-20 16:33:48 -08:00
Luan Nguyen
e2b5c88157 am 5ecbd6ad: am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '5ecbd6ad6909afe2f9c80d63670b9aa8850acc3e':
  docs: Fix issue with older devices section not expanding
2015-02-21 00:07:22 +00:00
Luan Nguyen
5ecbd6ad69 am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '677a175481a5d4eed73168a02406f6226f2c0c57':
  docs: Fix issue with older devices section not expanding
2015-02-21 00:00:01 +00:00
Luan Nguyen
677a175481 am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '969848c4484b5430e00cac7c317cc5e35e7ec8f5':
  docs: Fix issue with older devices section not expanding
2015-02-20 23:54:15 +00:00
Luan Nguyen
969848c448 am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit 'f900a1f48abde96e41f40f61d3610b6245a9f94c':
  docs: Fix issue with older devices section not expanding
2015-02-20 23:48:00 +00:00
Luan Nguyen
f900a1f48a am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '81752cf5148b93ef84f8890cb04876344924eae8':
  docs: Fix issue with older devices section not expanding
2015-02-20 23:40:47 +00:00
Luan Nguyen
81752cf514 Merge "docs: Fix issue with older devices section not expanding" into lmp-docs 2015-02-20 23:36:17 +00:00
Rich Slogar
ed1cf523ad docs: android plugin revisions page v2
Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2
2015-02-20 09:52:13 -08:00
David Friedman
7cdd6671f8 Fixes several typos.
Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca
2015-02-20 09:40:06 -08:00
Adrian Roos
823bf307a2 am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93':
  Fix change IME content description
2015-02-20 14:39:30 +00:00
Adrian Roos
b5e787c1c5 am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
  Fix change IME content description
2015-02-20 14:32:44 +00:00
Adrian Roos
26b0d973d8 Merge "Fix change IME content description" into lmp-mr1-dev 2015-02-20 14:28:38 +00:00
kmccormick
c808f6a6a2 am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'a8dbdb1c5a019ac6fbcd8c20d7837d80fc9e41b7':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:16:52 +00:00