OSDN Git Service
Eric Schmidt [Wed, 27 Jul 2016 23:14:42 +0000 (23:14 +0000)]
docs: Migrating multilingual-support to permanent home.
am:
32e428e78e
Change-Id: I9ca319c51756ea853479e4019520a670e46f9ffe
Eric Schmidt [Wed, 27 Jul 2016 22:19:49 +0000 (22:19 +0000)]
docs: Migrating icu4j-framework to permanent home
am:
10da34380a
Change-Id: I710e761b3ed4f462af826886c14a4386d7374430
Eric Schmidt [Fri, 22 Jul 2016 17:34:54 +0000 (10:34 -0700)]
docs: Migrating multilingual-support to permanent home.
Bug:
30224032
Change-Id: I14ddb924bdf6c17719520b7883ab601281c548c2
Eric Schmidt [Wed, 27 Jul 2016 21:46:56 +0000 (21:46 +0000)]
docs: Migrate notification-update to notifications docs
am:
bcce78731d
Change-Id: I121e018305eb67fb3210d384a77530033fed55bd
Eric Schmidt [Wed, 20 Jul 2016 18:47:33 +0000 (11:47 -0700)]
docs: Migrating icu4j-framework to permanent home
Bug:
30224272
Change-Id: I2d52a686f813d7299918abeb66be0a479ed49b70
Eric Schmidt [Sun, 24 Jul 2016 19:24:23 +0000 (12:24 -0700)]
docs: Migrate notification-update to notifications docs
Bug:
30224465
Change-Id: I43ded785db6c69d493965f50f798262595b2d026
Daniel Yu [Wed, 27 Jul 2016 20:20:26 +0000 (20:20 +0000)]
docs: Migrating Scoped Dir Access preview docs into DAC
am:
8a481eaf20
Change-Id: I53ae716ef626c0249d46df86ecd2682d90c7e740
Daniel Yu [Wed, 27 Jul 2016 20:20:21 +0000 (20:20 +0000)]
docs: Migrating Direct Boot preview docs into DAC
am:
bb0f35306e
Change-Id: I5a72146578321e4644af7fc8aeab3bf47afa8147
Daniel Yu [Wed, 27 Jul 2016 20:13:09 +0000 (20:13 +0000)]
docs: Migrating TV Recording APIs preview docs into DAC
am:
4900647321
Change-Id: I6a800ef249d10cffe0a03530f5e1ee7a8d4d2e38
Daniel Yu [Wed, 27 Jul 2016 20:13:06 +0000 (20:13 +0000)]
Merge \"docs: Migrating PIP preview docs into regular DAC docs\" into nyc-dev
am:
020726fac7
Change-Id: I1c2664b7773bef948bb5ba5d522abcf94a51602a
Daniel Yu [Wed, 27 Jul 2016 20:13:03 +0000 (20:13 +0000)]
docs: Migrating PIP preview docs into regular DAC docs
am:
e0fa75cfa7
Change-Id: Ia68e7ad021d1acf7373a7bbe0856167616572ecd
Hemal Patel [Wed, 27 Jul 2016 20:12:59 +0000 (20:12 +0000)]
Merge \\"Docs: Used NotificationCompat.MediaStyle\\" into nyc-docs am:
b2baf25d34
am:
b36153a8a1
Change-Id: I8ff6dbe07ebf4c3e07309f6155c5614244e907b2
Hemal Patel [Wed, 27 Jul 2016 20:12:56 +0000 (20:12 +0000)]
Docs: Used NotificationCompat.MediaStyle am:
d3c609cbc1
am:
bae260d909
Change-Id: I4024cad11f6664bdfd348c783193c47c5eb76a7a
Daniel Yu [Fri, 22 Jul 2016 22:50:58 +0000 (15:50 -0700)]
docs: Migrating Scoped Dir Access preview docs into DAC
For Android N release, migrating and updating Scoped Directory Access
docs into regular DAC docs. Updated TOC and added redirect.
Removed preview/features doc. Updated and moved images.
Bug:
30257320
Change-Id: I3440fe1b74947cbfbd1ada6f5d6bee5e49847927
Daniel Yu [Fri, 22 Jul 2016 00:43:35 +0000 (17:43 -0700)]
docs: Migrating Direct Boot preview docs into DAC
For Android N release, migrating and updating Direct Boot
docs into regular DAC docs. Updated TOC and added redirect.
Removed preview/features doc.
Bug:
30256895
Change-Id: I5c6d457dc69c911199f86f0e0ed93ec7d6244779
Daniel Yu [Thu, 21 Jul 2016 20:45:31 +0000 (13:45 -0700)]
docs: Migrating TV Recording APIs preview docs into DAC
For Android N release, migrating and updating TV Recording
API preview docs into regular DAC TV (TIF) docs. Updating
training TOC and adding redirect. Removing preview/features doc.
Bug:
30224466
Change-Id: Ia92f27467ccaa1d36dc69c5bd3c784509f267791
Dan Yu [Wed, 27 Jul 2016 19:29:40 +0000 (19:29 +0000)]
Merge "docs: Migrating PIP preview docs into regular DAC docs" into nyc-dev
Hemal Patel [Wed, 27 Jul 2016 19:26:10 +0000 (19:26 +0000)]
Merge \"Docs: Used NotificationCompat.MediaStyle\" into nyc-docs
am:
b2baf25d34
Change-Id: Iff64c50170add9331ad840b3a2c60170947922d6
Hemal Patel [Wed, 27 Jul 2016 19:26:05 +0000 (19:26 +0000)]
Docs: Used NotificationCompat.MediaStyle
am:
d3c609cbc1
Change-Id: Ia297b36f995caa5b552722d475461ec1be321136
Hemal Patel [Wed, 27 Jul 2016 19:13:52 +0000 (19:13 +0000)]
Merge "Docs: Used NotificationCompat.MediaStyle" into nyc-docs
Daniel Yu [Tue, 19 Jul 2016 20:45:38 +0000 (13:45 -0700)]
docs: Migrating PIP preview docs into regular DAC docs
For Android N release, migrating and updating PIP preview docs
into regular DAC TV docs. Updating TOCs and redirects as well.
Bug:
26487936
Change-Id: I00a57cc0bfff6929cdba56ce00a6a5e9a292e345
Adarsh Fernando [Wed, 27 Jul 2016 16:01:55 +0000 (16:01 +0000)]
Merge \"Docs: Clarified certain restrictions to whitelisted apps\" into nyc-dev
am:
ec694b4e27
Change-Id: I31ebdc2a2a3450bd309bdaf2a882afc2846f64ed
Adarsh Fernando [Wed, 27 Jul 2016 16:01:50 +0000 (16:01 +0000)]
Docs: Clarified certain restrictions to whitelisted apps
am:
33aae3167d
Change-Id: Ib3375115339c2abf699bcc6601aeccca67219673
Adarsh Fernando [Wed, 27 Jul 2016 15:49:50 +0000 (15:49 +0000)]
Merge "Docs: Clarified certain restrictions to whitelisted apps" into nyc-dev
Bill Yi [Wed, 27 Jul 2016 15:05:17 +0000 (15:05 +0000)]
Import translations. DO NOT MERGE
am:
cdd4f84e06 -s ours
Change-Id: I6e14618caf9ce565b28148fe75827416fc1894cc
Bill Yi [Wed, 27 Jul 2016 13:34:57 +0000 (06:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id7ec746499ef9a1309384e04bdb556d1616b8c11
Auto-generated-cl: translation import
Sergio Giro [Wed, 27 Jul 2016 12:20:12 +0000 (12:20 +0000)]
api: destroy() and isDestroyed() methods are now default in Destroyable
am:
8261d1e042
Change-Id: I0f377bfb1f091e642091859fbb045ccfe63ba0e5
Sergio Giro [Tue, 26 Jul 2016 19:05:22 +0000 (20:05 +0100)]
api: destroy() and isDestroyed() methods are now default in Destroyable
Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug:
29631070
Sergio Giro [Wed, 27 Jul 2016 11:46:25 +0000 (11:46 +0000)]
Merge \\"api: destroy() and isDestroyed() methods are now default in Destroyable\\" am:
877d6e75e6
am:
91e11c95f2
Change-Id: Ib7472ea12d6c59ec6ca36d0c17d63ab5d5193b77
Sergio Giro [Wed, 27 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\"
am:
877d6e75e6
Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
Sergio Giro [Wed, 27 Jul 2016 11:30:55 +0000 (11:30 +0000)]
Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"
Alan Leung [Wed, 27 Jul 2016 06:01:46 +0000 (06:01 +0000)]
Merge "Fix thread priority after boosting." into nyc-dev-plus-aosp
Mark Lu [Wed, 27 Jul 2016 00:49:19 +0000 (00:49 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe
am:
3977f8351a
Change-Id: Iea59ad167957f314adc09d90f734e1cd123577e4
Mark Lu [Wed, 27 Jul 2016 00:40:03 +0000 (00:40 +0000)]
docs: updates to Buildilng Your First App doc
am:
ae47d9d4fe
Change-Id: I7b3665dc0f304dcae06939a56c2423d9b269420c
Mark Lu [Fri, 15 Jul 2016 20:36:55 +0000 (13:36 -0700)]
docs: updates to Buildilng Your First App doc
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy
Bug:
29766869
Bug:
29768686
Bug:
19154557
Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
(cherry picked from commit
08d1bff71f19e5567b8f545314fd84701e9b2cec)
Hemal Patel [Fri, 22 Jul 2016 22:50:48 +0000 (15:50 -0700)]
Docs: Used NotificationCompat.MediaStyle
In the Controlling Media section, updated the overview and sample code to
reference NotificationCompat.MediaStyle. Removed the note about the
pre-requisite to have Android 5.0 and higher.
Bug:
22505224
Change-Id: Id9a647ca8eec7f1b763227ee4fd1f18dee4bcb6f
Adarsh Fernando [Tue, 26 Jul 2016 19:27:37 +0000 (12:27 -0700)]
Docs: Clarified certain restrictions to whitelisted apps
Bug:
30133512
Change-Id: I4494f85090b384831bc2534cbc813f28a62a29cf
Kevin Hufnagle [Tue, 26 Jul 2016 19:03:57 +0000 (19:03 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: If1ba3b821a6ccb368c6c61212d44ccfd04d8e7ef
Kevin Hufnagle [Thu, 21 Jul 2016 20:30:49 +0000 (13:30 -0700)]
docs: Migrated "Network Security Configuration" page on DAC (N OTA).
This page now resides with other pages discussing Android security
topics.
Bug:
27502850
Change-Id: I8ce3412198527a947e47e421b94c3d15cce6ec48
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:38 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I1107bc377d35c8bb63a2b90118c17940105cddaf
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:35 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I86c74144ab6530c566550b71855f02e09840d7fe
Kevin Hufnagle [Tue, 26 Jul 2016 18:34:23 +0000 (18:34 +0000)]
Merge "docs: Migrated "key attestation" page to a new location (for N OTA)." into nyc-dev
Marco Nelissen [Tue, 26 Jul 2016 15:48:05 +0000 (15:48 +0000)]
Merge \\"Fix memory leak in MediaScannerConnection\\" am:
e40ab18590
am:
0d5bcda101
Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]
Merge \"Fix memory leak in MediaScannerConnection\"
am:
e40ab18590
Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Mark Lu [Mon, 25 Jul 2016 22:38:18 +0000 (22:38 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Id58dd0692053ddbf41a93d6f2e45d78c4ef50df5
Mark Lu [Mon, 25 Jul 2016 22:38:08 +0000 (22:38 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I66aa204bf8618ab5af8613fac350d511b3f0486b
Elliot Waite [Mon, 25 Jul 2016 22:37:56 +0000 (22:37 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
Kevin Hufnagle [Wed, 20 Jul 2016 21:14:55 +0000 (14:14 -0700)]
docs: Migrated "key attestation" page to a new location (for N OTA).
Updated page location, TOC entry, and URL redirect in preparation
for Android Nougat OTA release.
Bug:
28851641
Change-Id: I8be252d79b0b5ad3c7d814175e6bfbfb98e95daf
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
TreeHugger Robot [Mon, 25 Jul 2016 18:45:50 +0000 (18:45 +0000)]
Merge "docs: updates to Buildilng Your First App doc" into nyc-dev
Mark Lu [Fri, 15 Jul 2016 20:36:55 +0000 (13:36 -0700)]
docs: updates to Buildilng Your First App doc
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy
Bug:
29766869
Bug:
29768686
Bug:
19154557
Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
Dirk Dougherty [Mon, 25 Jul 2016 17:00:18 +0000 (17:00 +0000)]
Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\" into nyc-dev
am:
30588da701
Change-Id: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:45 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a
am:
616ba9d22b
Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:25 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\" into nyc-dev
am:
aa57295104
Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480
am:
15865b5c67
Change-Id: I7a4149cae91c3564c6c6fa88c2cfa1d7bad2fe30
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c
am:
29df77dd86
Change-Id: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:06 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87
am:
b65288fcb5
Change-Id: I34605fa43f1c4ddd26baa7f4d06760cdb602d41e
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:55 +0000 (15:46 +0000)]
Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a" into nyc-dev
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:33 +0000 (15:46 +0000)]
Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480" into nyc-dev
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:56 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a
am:
260e77f68a
Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:51 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350
am:
e059c15480
Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:47 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a
am:
c59557649c
Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:45 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350
am:
22be9b1a87
Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:27 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am:
c46ee88f9a
Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:22 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am:
7ce51cf350
Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:20 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am:
c46ee88f9a
Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:18 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am:
7ce51cf350
Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4
Kevin Hufnagle [Mon, 25 Jul 2016 15:33:02 +0000 (15:33 +0000)]
Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs
Jesse Hall [Mon, 25 Jul 2016 03:53:11 +0000 (03:53 +0000)]
Merge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am:
189bbd9f6d
am:
9495872add
Change-Id: Iaed82af8a48b84972b3b2336a1dc1299851a2f08
Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am:
189bbd9f6d
Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"
Elliot Waite [Fri, 24 Jun 2016 20:52:10 +0000 (13:52 -0700)]
Fix code tags that contain html encoded characters, and fix at links.
Change-Id: I1ab2275ac17d75afaa8f3f0039b26633365bcb3a
Andrew Solovay [Fri, 22 Jul 2016 20:30:01 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b
am:
6a2782548d
Change-Id: Id4496ca42ca6d3d9989bbbee2a71b01af23086a0
Andrew Solovay [Fri, 22 Jul 2016 20:14:57 +0000 (20:14 +0000)]
docs: Updated support library revision history for 24.1.1
am:
0b80531b5b
Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076
Andrew Solovay [Fri, 22 Jul 2016 18:35:04 +0000 (11:35 -0700)]
docs: Updated support library revision history for 24.1.1
See first comment for doc stage location.
bug:
30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05
Benjamin Franz [Fri, 22 Jul 2016 08:47:48 +0000 (08:47 +0000)]
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am:
f97faada5d
Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186
Benjamin Franz [Fri, 22 Jul 2016 08:47:40 +0000 (08:47 +0000)]
Block user from setting safe boot setting via adb
am:
0ff13fce6f
Change-Id: Ic8da0b5ffbc285f4371f68c189054a0005b90751
Benjamin Franz [Fri, 22 Jul 2016 08:37:30 +0000 (08:37 +0000)]
Merge "Block user from setting safe boot setting via adb" into nyc-dev
Chih-hung Hsieh [Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
am:
05160d70d1
Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]
Merge "Fix google-explicit-constructor warnings in frameworks/base"
Andrew Solovay [Thu, 21 Jul 2016 23:56:57 +0000 (23:56 +0000)]
Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am:
1d545c4f83
am:
adfb20c2f0
Change-Id: I45b64c1ad1359f4ce908db07d968cffeb9406ace
Andrew Solovay [Thu, 21 Jul 2016 23:56:50 +0000 (23:56 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd
am:
85d40b4feb
Change-Id: I7bac719771e700f33e1081a34a76d3f656bbe65d
Andrew Solovay [Thu, 21 Jul 2016 23:48:00 +0000 (23:48 +0000)]
Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
am:
1d545c4f83
Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38
Andrew Solovay [Thu, 21 Jul 2016 23:47:58 +0000 (23:47 +0000)]
docs: Replacing curly apostrophes with straight ones
am:
abea4b1dcd
Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa
Chih-Hung Hsieh [Thu, 21 Jul 2016 18:23:06 +0000 (11:23 -0700)]
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
TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
David Gross [Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)]
resolve merge conflicts of
95e42d9 to nyc-dev-plus-aosp
Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e
Andrew Solovay [Thu, 21 Jul 2016 20:50:23 +0000 (13:50 -0700)]
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
Sreevani Sreejith [Thu, 21 Jul 2016 20:43:06 +0000 (20:43 +0000)]
Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\" into nyc-dev
am:
7e9ce5ceaa
Change-Id: Ic5f9b2cd6e099cc350b07ba81cdd96700cfd9077
sreevanis [Thu, 21 Jul 2016 20:43:02 +0000 (20:43 +0000)]
Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18
am:
daaa7b7e5b
Change-Id: I4d8a02a6e09e967733f1d0ec36a23f4a73ce40f2
Android Build Merger (Role) [Thu, 21 Jul 2016 20:39:26 +0000 (20:39 +0000)]
Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d am:
9b911b8736" into nyc-dev
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:53 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d
am:
9b911b8736
Change-Id: If294d38647849c51c2ba46b041417346a410c533
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:48 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d
am:
01f12a9e18
Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71
sreevanis [Thu, 21 Jul 2016 20:32:55 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am:
71f742920d
Change-Id: Ia489afb465582c6600d35ffed5826816b4043746
sreevanis [Thu, 21 Jul 2016 20:32:51 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am:
71f742920d
Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175
Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]
Merge "docs: Fixed typo." into mnc-io-docs
David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]
resolve merge conflicts of
ed6625d to stage-aosp-master
Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8
OSDN Git Service
