Andrew Solovay
cc94c31e15
Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am: 1d545c4f83
...
am: adfb20c2f0
2016-07-21 23:56:57 +00:00
Andrew Solovay
c3ec8f28a5
docs: Replacing curly apostrophes with straight ones am: abea4b1dcd
...
am: 85d40b4feb
2016-07-21 23:56:50 +00:00
Andrew Solovay
adfb20c2f0
Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
...
am: 1d545c4f83
2016-07-21 23:48:00 +00:00
Andrew Solovay
85d40b4feb
docs: Replacing curly apostrophes with straight ones
...
am: abea4b1dcd
2016-07-21 23:47:58 +00:00
TreeHugger Robot
1d545c4f83
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
2016-07-21 23:07:16 +00:00
David Gross
289688de68
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
...
Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e
2016-07-21 14:06:20 -07:00
Andrew Solovay
abea4b1dcd
docs: Replacing curly apostrophes with straight ones
...
Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.
Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9
2016-07-21 13:50:23 -07:00
Sreevani Sreejith
d0516671b1
Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\" into nyc-dev
...
am: 7e9ce5ceaa
2016-07-21 20:43:06 +00:00
sreevanis
11dca20c16
Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
...
am: daaa7b7e5b
2016-07-21 20:43:02 +00:00
Android Build Merger (Role)
7e9ce5ceaa
Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736" into nyc-dev
2016-07-21 20:39:27 +00:00
Sreevani Sreejith
96b4483984
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
...
am: 9b911b8736
2016-07-21 20:38:53 +00:00
Sreevani Sreejith
daaa7b7e5b
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
...
am: 01f12a9e18
2016-07-21 20:38:48 +00:00
sreevanis
01f12a9e18
Merge \"docs: Fixed typo.\" into mnc-io-docs
...
am: 71f742920d
2016-07-21 20:32:55 +00:00
sreevanis
9b911b8736
Merge \"docs: Fixed typo.\" into mnc-io-docs
...
am: 71f742920d
2016-07-21 20:32:51 +00:00
Sreevani Sreejith
71f742920d
Merge "docs: Fixed typo." into mnc-io-docs
2016-07-21 20:24:51 +00:00
David Gross
95e42d97f4
resolve merge conflicts of ed6625d to stage-aosp-master
...
Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8
2016-07-21 11:43:15 -07:00
Amanda Kassay
07d5731381
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
...
am: 5a76378471
2016-07-21 17:09:39 +00:00
Amanda Kassay
5a76378471
Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev
2016-07-21 17:02:13 +00:00
David Gross
ed6625d907
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
2016-07-21 16:15:37 +00:00
Benjamin Franz
461309a63a
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours
...
am: 662e2a7975
2016-07-21 15:39:58 +00:00
Billy Lamberta
4f93fdb999
Merge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\" into nyc-dev
...
am: 7dbcfcadd5
2016-07-21 15:39:55 +00:00
Billy Lamberta
576f482813
docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
...
am: c7cffa3e6a
2016-07-21 15:39:52 +00:00
Amanda Kassay
0d6757dafd
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3
...
am: e9d58227bb
2016-07-21 15:39:48 +00:00
Benjamin Franz
662e2a7975
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
...
am: cb805b35f3
2016-07-21 15:27:28 +00:00
Android Build Merger (Role)
7dbcfcadd5
Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev
2016-07-21 15:22:32 +00:00
Mark Lu
876f854c3e
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
...
am: a7ce29962c
2016-07-21 15:22:14 +00:00
Billy Lamberta
c5ec6c443d
docs: work - Managed configuration bundles am: ef57498142
...
am: ba633fc919
2016-07-21 15:21:58 +00:00
Billy Lamberta
c7cffa3e6a
docs: work - Managed configuration bundles am: ef57498142
...
am: 9684f2cd2f
2016-07-21 15:21:52 +00:00
Amanda Kassay
e9d58227bb
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
...
am: 83fb75ded3
2016-07-21 15:21:50 +00:00
Benjamin Franz
cb805b35f3
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
...
am: 87534f4ac9
2016-07-21 10:14:59 +00:00
Benjamin Franz
87534f4ac9
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
...
am: 7abd7ba093
2016-07-21 10:10:03 +00:00
Benjamin Franz
7abd7ba093
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
...
am: 3e582390b3
2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
2016-07-21 09:59:42 +00:00
David Gross
05eef3040e
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
...
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug: 27299393
Bug: 30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
2016-07-20 16:04:35 -07:00
Billy Lamberta
9684f2cd2f
docs: work - Managed configuration bundles
...
am: ef57498142
2016-07-20 22:15:57 +00:00
Billy Lamberta
ba633fc919
docs: work - Managed configuration bundles
...
am: ef57498142
2016-07-20 22:15:39 +00:00
Billy Lamberta
ef57498142
docs: work - Managed configuration bundles
...
Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.
bug: 26151150
bug: 29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e
2016-07-20 15:03:44 -07:00
Christopher Ferris
96d02a6c08
Merge \\"Remove dependency on android_alarm.h.\\" am: c95e7a3014
...
am: 8f7223e420
2016-07-20 18:18:17 +00:00
Amanda Kassay
83fb75ded3
Fix for b/30088807 Dashboard page repeating charts three times on mobile.
...
Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
Change-Id: Iff6820353ff6fb3ec678ddfe209b2200ab872812
2016-07-20 18:12:37 +00:00
Christopher Ferris
8f7223e420
Merge \"Remove dependency on android_alarm.h.\"
...
am: c95e7a3014
2016-07-20 18:10:47 +00:00
Christopher Ferris
c95e7a3014
Merge "Remove dependency on android_alarm.h."
2016-07-20 18:03:48 +00:00
Mark Lu
a7ce29962c
Merge "docs: fixed '@' signs that were escaped improperly" into nyc-dev
2016-07-20 16:48:26 +00:00
Paul Stewart
a7aa029132
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7 am: a20314a28e
...
am: a71fe00594
2016-07-20 03:23:13 +00:00
Paul Stewart
756def010b
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a am: 6b05e285cc
...
am: 47e801972c
2016-07-20 03:23:10 +00:00
Paul Stewart
371aa0d792
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9 am: cf3595400b -s ours
...
am: d77404a0e5
2016-07-20 03:23:05 +00:00
Paul Stewart
a71fe00594
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7
...
am: a20314a28e
2016-07-20 03:17:07 +00:00
Paul Stewart
47e801972c
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a
...
am: 6b05e285cc
2016-07-20 03:17:01 +00:00
Paul Stewart
d77404a0e5
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9
...
am: cf3595400b
2016-07-20 03:16:50 +00:00
Paul Stewart
a20314a28e
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165
...
am: 2331eefef7
2016-07-20 01:35:14 +00:00
Paul Stewart
6b05e285cc
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437
...
am: 537535c14a
2016-07-20 01:35:10 +00:00
