Kevin Hufnagle
616ba9d22b
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
...
am: 260e77f68a
2016-07-25 15:45:56 +00:00
Kevin Hufnagle
15865b5c67
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
...
am: e059c15480
2016-07-25 15:45:51 +00:00
Kevin Hufnagle
29df77dd86
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
...
am: c59557649c
2016-07-25 15:45:47 +00:00
Kevin Hufnagle
b65288fcb5
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
...
am: 22be9b1a87
2016-07-25 15:45:45 +00:00
Kevin Hufnagle
c59557649c
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
...
am: c46ee88f9a
2016-07-25 15:39:27 +00:00
Kevin Hufnagle
22be9b1a87
docs: Fixed option for \"launchMode\" within Android manifest doc.
...
am: 7ce51cf350
2016-07-25 15:39:22 +00:00
Kevin Hufnagle
260e77f68a
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
...
am: c46ee88f9a
2016-07-25 15:39:20 +00:00
Kevin Hufnagle
e059c15480
docs: Fixed option for \"launchMode\" within Android manifest doc.
...
am: 7ce51cf350
2016-07-25 15:39:18 +00:00
Kevin Hufnagle
c46ee88f9a
Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs
2016-07-25 15:33:03 +00:00
Jesse Hall
41ebe86049
Merge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am: 189bbd9f6d
...
am: 9495872add
2016-07-25 03:53:11 +00:00
Sai Kiran Korwar
9495872add
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
...
am: 189bbd9f6d
2016-07-25 03:46:44 +00:00
Jesse Hall
189bbd9f6d
Merge "bootanimation: Call eglReleaseThread in threadLoop"
2016-07-25 03:36:57 +00:00
Andrew Solovay
09f5a77754
docs: Removing N Preview AfW doc, and setting up redirect
...
Confirmed with AfW team that the AfW material is being moved into
their developer site
(https://developers.google.com/android/work/overview ). Removing
the N docs, and redirecting to their site.
Change-Id: I5174f7dccf6c206af9e091efdab099a04f1cb750
2016-07-23 14:10:32 -07:00
Andrew Solovay
563c4f1adb
docs: Added Android N (API level 24) to the "API levels" table
...
Added links based on the assumption that the Nougat overview docs
will be named the same way the Marshmallow ones were.
See first comment for doc stage location.
bug: 30325924
Change-Id: Ic5845a0c301af2462247a6827d9b36c5a0e1b1d3
2016-07-23 13:58:25 -07:00
Elliot Waite
c4ae7827e2
Fix code tags that contain html encoded characters, and fix at links.
...
Change-Id: I1ab2275ac17d75afaa8f3f0039b26633365bcb3a
2016-07-22 18:29:36 -07:00
Andrew Solovay
c02411f38d
docs: Fixed bad link to cloud-backup training class
...
The name and URL of the old "Syncing to the Cloud" class had changed.
Fixed a single bad link; also changed the title on other pages where
the class was referred to by the old name.
I know that changing the _toc.cs files is redundant at this point
(since we don't use those files to generate TOCs any more) but I
figured I'd do it for consistency's sake.
See first comment for doc stage location.
bug: 30309375
Change-Id: I0cd8b1442ef3a8dd8a1917e897a3f0555c48e6ef
2016-07-22 14:44:03 -07:00
Andrew Solovay
03453b98d8
docs: Updated support library revision history for 24.1.1 am: 0b80531b5b
...
am: 6a2782548d
2016-07-22 20:30:01 +00:00
Andrew Solovay
6a2782548d
docs: Updated support library revision history for 24.1.1
...
am: 0b80531b5b
2016-07-22 20:14:57 +00:00
Andrew Solovay
0b80531b5b
docs: Updated support library revision history for 24.1.1
...
See first comment for doc stage location.
bug: 30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05
2016-07-22 11:35:04 -07:00
Benjamin Franz
e84d37f1ee
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
...
am: f97faada5d
2016-07-22 08:47:48 +00:00
Benjamin Franz
c86e8c3442
Block user from setting safe boot setting via adb
...
am: 0ff13fce6f
2016-07-22 08:47:40 +00:00
Benjamin Franz
f97faada5d
Merge "Block user from setting safe boot setting via adb" into nyc-dev
2016-07-22 08:37:31 +00:00
Chih-hung Hsieh
3fb651b0b7
resolve merge conflicts of 5152fd9 to stage-aosp-master
...
am: 05160d70d1
2016-07-22 01:53:29 +00:00
Chih-Hung Hsieh
05160d70d1
resolve merge conflicts of 5152fd9 to stage-aosp-master
...
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
2016-07-21 18:13:31 -07:00
Chih-hung Hsieh
5152fd909c
Merge "Fix google-explicit-constructor warnings in frameworks/base"
2016-07-22 00:55:18 +00:00
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
Chih-Hung Hsieh
faecb78a6b
Fix google-explicit-constructor warnings in frameworks/base
...
* Add explicit keyword to conversion constructors.
* Add NOLINT to implicit conversion constructors.
Bug: 28341362
Test: build with clang-tidy
Change-Id: Ie4d37072ab57d1662d18db4de1c8577247f43337
2016-07-21 16:24:06 -07: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
