Chris Craik
a9ad0fc793
am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
...
* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
Explain behavior of boundless ripple projection
2015-02-25 00:26:51 +00:00
Andrew Solovay
79cb98c6ce
docs: New "implementing app restrictions" doc
...
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.
Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4
am ea2a0648: Explain behavior of boundless ripple projection
...
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
Explain behavior of boundless ripple projection
2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8
Explain behavior of boundless ripple projection
...
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
2015-02-25 00:12:38 +00:00
Sanket Padawe
ea4713d6e5
Changing usage of carrier name field of SubInfoRecord
...
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:15:15 -08:00
Jason Monk
de3260b5bf
Keyguard: Use plmn/spn broadcast when no SIMs
...
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.
Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
2015-02-24 10:13:47 -05:00
Joe LaPenna
c0c395162f
Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
2015-02-24 00:37:15 +00:00
Junda Liu
985f52cde5
Fix incorrect condition for sub id check.
...
Bug: b/19277299
Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
2015-02-23 16:06:51 -08:00
Deepanshu Gupta
68501b87d2
Better error msg for StateList/Hexadecimal Color.
...
Throw a better error message when resolving a hexadecimal color value
but the user gave a Color State List. The two are easy to confuse since
the only way to distinguish between the two is to look at the
definition.
Bug: http://b.android.com/70110
Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
2015-02-23 12:00:38 -08:00
Rich Slogar
6de010f600
docs: remove exploring sdk link
...
b.android 153523
Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
2015-02-23 11:37:36 -08:00
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
