OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "docs: Fix typo behavrio -> behavior" into mnc-docs
Dan Dascalescu [Thu, 18 Feb 2016 21:03:02 +0000 (21:03 +0000)]
Merge "docs: Fix typo behavrio -> behavior" into mnc-docs
am: 3563af7117

* commit '3563af711752a173300af81056620711e48c3b1e':
  docs: Fix typo behavrio -> behavior

8 years agoMerge "docs: Fix typo behavrio -> behavior" into mnc-docs
Dan Dascalescu [Thu, 18 Feb 2016 20:55:47 +0000 (20:55 +0000)]
Merge "docs: Fix typo behavrio -> behavior" into mnc-docs

8 years agoMerge "Add link to Family Playbook from DFF page." into mnc-docs
Dirk Dougherty [Thu, 18 Feb 2016 03:10:49 +0000 (03:10 +0000)]
Merge "Add link to Family Playbook from DFF page." into mnc-docs
am: eb5d317666

* commit 'eb5d317666f86b4c0ab125df385cefd03430b3ef':
  Add link to Family Playbook from DFF page.

8 years agoMerge "Add link to Family Playbook from DFF page." into mnc-docs
Dirk Dougherty [Thu, 18 Feb 2016 02:44:14 +0000 (02:44 +0000)]
Merge "Add link to Family Playbook from DFF page." into mnc-docs

8 years agoAdd link to Family Playbook from DFF page.
Dirk Dougherty [Thu, 18 Feb 2016 02:31:45 +0000 (18:31 -0800)]
Add link to Family Playbook from DFF page.

Bug: 27143672

Change-Id: I68ec7a4fed5fa129ab4fe4883aba49925660ecb4

8 years agoMerge "docs: Updates to Implementing App Restrictions 3" into mnc-docs
Matt Werner [Thu, 18 Feb 2016 01:52:04 +0000 (01:52 +0000)]
Merge "docs: Updates to Implementing App Restrictions 3" into mnc-docs
am: fc68c252f9

* commit 'fc68c252f9e1b6c9442711357a2c677494c7787a':
  docs: Updates to Implementing App Restrictions 3

8 years agoMerge "docs: Updates to Implementing App Restrictions 3" into mnc-docs
Matt Werner [Thu, 18 Feb 2016 01:28:25 +0000 (01:28 +0000)]
Merge "docs: Updates to Implementing App Restrictions 3" into mnc-docs

8 years agodocs: Updates to Implementing App Restrictions 3
Matt [Wed, 17 Feb 2016 00:38:50 +0000 (19:38 -0500)]
docs: Updates to Implementing App Restrictions 3

Bug: 23627319

Added documentation for app restriction features that launched with
M. Also added a diagram. This CL supersedes the abandoned doc changes in
CL 856620 and 856303

Change-Id: Ided960529199b6f6a93137fa59ade4dcebc560c7

8 years agoMerge "docs: Fixed extra slash in pathname" into mnc-docs
Eric Schmidt [Wed, 17 Feb 2016 21:41:12 +0000 (21:41 +0000)]
Merge "docs: Fixed extra slash in pathname" into mnc-docs
am: 33b4f67ff2

* commit '33b4f67ff2c1cef190284475de926b0fc749a053':
  docs: Fixed extra slash in pathname

8 years agoMerge "docs: Fixed extra slash in pathname" into mnc-docs
Eric Schmidt [Wed, 17 Feb 2016 21:36:40 +0000 (21:36 +0000)]
Merge "docs: Fixed extra slash in pathname" into mnc-docs

8 years agodocs: Fixed extra slash in pathname
Eric Schmidt [Mon, 8 Feb 2016 21:11:05 +0000 (13:11 -0800)]
docs: Fixed extra slash in pathname

Bug: 25103994
Change-Id: I89aaf3d7d63de989b8adbcf0306f5dc5f415e98d

8 years agodocs: Re-sorting list
Andrew Solovay [Wed, 17 Feb 2016 20:25:17 +0000 (20:25 +0000)]
docs: Re-sorting list
am: 019375b5d7

* commit '019375b5d716bc440aa2f6965db30d67f1440f14':
  docs: Re-sorting list

8 years agodocs: Re-sorting list
Andrew Solovay [Wed, 17 Feb 2016 19:22:59 +0000 (11:22 -0800)]
docs: Re-sorting list

List of normal permissions had drifted from alphabetical order;
fixed.

See first comment for doc stage location.

Change-Id: I031d1142275c9fd53a2ce16fcd54fdcf206d03a7

8 years agoRemove -includePreview flag until support is available in doclava.
Dirk Dougherty [Wed, 17 Feb 2016 06:28:55 +0000 (22:28 -0800)]
Remove -includePreview flag until support is available in doclava.

Change-Id: I3b644bd50d42ea260bed09c9c5bdab6d3d6a8b75

8 years agoMerge "Add preview docs dir, toc, and basic files." into mnc-mr-docs
Dirk Dougherty [Wed, 17 Feb 2016 05:32:59 +0000 (05:32 +0000)]
Merge "Add preview docs dir, toc, and basic files." into mnc-mr-docs

8 years agoMerge "docs: Fix "Spenned" typo" into mnc-docs
Dan Dascalescu [Wed, 17 Feb 2016 00:06:24 +0000 (00:06 +0000)]
Merge "docs: Fix "Spenned" typo" into mnc-docs
am: 884708107c

* commit '884708107cb4cb6a4bd2fd4fde4e0072e5022f8d':
  docs: Fix "Spenned" typo

8 years agoMerge "docs: Fix typo mimeType:name -> android:mimeType" into mnc-docs
Dan Dascalescu [Tue, 16 Feb 2016 23:57:28 +0000 (23:57 +0000)]
Merge "docs: Fix typo mimeType:name -> android:mimeType" into mnc-docs
am: 5159f54a15

* commit '5159f54a15bc1a66c5d48744a03e32816c09c169':
  docs: Fix typo mimeType:name -> android:mimeType

8 years agoMerge "docs: Fix "Spenned" typo" into mnc-docs
Dan Dascalescu [Tue, 16 Feb 2016 23:36:49 +0000 (23:36 +0000)]
Merge "docs: Fix "Spenned" typo" into mnc-docs

8 years agoMerge "docs: Fix typo mimeType:name -> android:mimeType" into mnc-docs
Dan Dascalescu [Tue, 16 Feb 2016 23:35:55 +0000 (23:35 +0000)]
Merge "docs: Fix typo mimeType:name -> android:mimeType" into mnc-docs

8 years agoAdded redesign flags for devsite content build
Amanda Kassay [Tue, 16 Feb 2016 20:25:03 +0000 (20:25 +0000)]
Added redesign flags for devsite content build
am: c3651f41fb

* commit 'c3651f41fbedb5a45e032cd8111a0f2d42ba7cd7':
  Added redesign flags for devsite content build

8 years agoAdded redesign flags for devsite content build
Amanda Kassay [Tue, 16 Feb 2016 17:00:09 +0000 (12:00 -0500)]
Added redesign flags for devsite content build

Change-Id: Ifea2cf00f2857be0f8ac95952110d4d4bc9df54e

8 years agoDocs: Minor wording tweak to Vulkan landing page.
David Friedman [Sat, 13 Feb 2016 02:41:31 +0000 (02:41 +0000)]
Docs: Minor wording tweak to Vulkan landing page.
am: 8c54f6d4e9

* commit '8c54f6d4e9e0a2a09deb603b86b5bb5e7605069b':
  Docs: Minor wording tweak to Vulkan landing page.

8 years agoDocs: Minor wording tweak to Vulkan landing page.
David Friedman [Sat, 13 Feb 2016 02:32:54 +0000 (18:32 -0800)]
Docs: Minor wording tweak to Vulkan landing page.

Bug: N/A
Change-Id: I9e4d44bd5cf1d5dfddbeadac4a67c1a227894f92

8 years agoMerge "Docs: Landing page for Vulkan docs." into mnc-docs
David Friedman [Fri, 12 Feb 2016 23:51:39 +0000 (23:51 +0000)]
Merge "Docs: Landing page for Vulkan docs." into mnc-docs
am: e37c699954

* commit 'e37c699954b66980f7780da28c7b1d2253145d74':
  Docs: Landing page for Vulkan docs.

8 years agoMerge "Docs: Landing page for Vulkan docs." into mnc-docs
David Friedman [Fri, 12 Feb 2016 23:40:34 +0000 (23:40 +0000)]
Merge "Docs: Landing page for Vulkan docs." into mnc-docs

8 years agoDocs: Landing page for Vulkan docs.
David Friedman [Tue, 9 Feb 2016 02:54:11 +0000 (18:54 -0800)]
Docs: Landing page for Vulkan docs.

Bug: 26568797
Change-Id: I149c86cc3ea463b64d4b04dc12608c85f0891f2f

8 years agodocs: Fixing comment that caused broken Javadoc.
Andrew Solovay [Thu, 11 Feb 2016 00:30:46 +0000 (00:30 +0000)]
docs: Fixing comment that caused broken Javadoc.
am: 9d8f752eb0

* commit '9d8f752eb07c2ea1608a6d4ad3ccc42e2f00aab8':
  docs: Fixing comment that caused broken Javadoc.

8 years agodocs: Fixing comment that caused broken Javadoc.
Andrew Solovay [Wed, 10 Feb 2016 23:58:08 +0000 (15:58 -0800)]
docs: Fixing comment that caused broken Javadoc.

A comment didn't end with a period; since the comment was
being used as the summary for a Javadoc table, and included
documentation was being used as the details Javadoc comment, the
lack of a period was messing up the Javadoc formatting
( https://screenshot.googleplex.com/4cp0QHV35iW )

See first comment for doc stage location.

bug: 27130226
Change-Id: I907ffc6efa4148e98a3c35b6d03c85f50103c23a

8 years agoMerge "docs: Documentation for using China variant of the Android Wear SDK." into...
Sreevani Sreejith [Wed, 10 Feb 2016 18:12:14 +0000 (18:12 +0000)]
Merge "docs: Documentation for using China variant of the Android Wear SDK." into mnc-docs
am: 82d0902190

* commit '82d090219056c31c2fd62f8ebca81b8dc28b7beb':
  docs: Documentation for using China variant of the Android Wear SDK.

8 years agoMerge "docs: Documentation for using China variant of the Android Wear SDK." into...
Sreevani Sreejith [Wed, 10 Feb 2016 18:08:22 +0000 (18:08 +0000)]
Merge "docs: Documentation for using China variant of the Android Wear SDK." into mnc-docs

8 years agoMerge "Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf...
Scott Main [Tue, 9 Feb 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871" into mnc-docs
am: 7a00c3d0ea

* commit '7a00c3d0eaadb3466f0331d8152ca2479e95bbd4':
  Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871

8 years agoMerge "Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf...
Scott Main [Tue, 9 Feb 2016 19:06:49 +0000 (19:06 +0000)]
Merge "Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871" into mnc-docs

8 years agoFix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871
smain@google.com [Tue, 9 Feb 2016 19:04:27 +0000 (11:04 -0800)]
Fix broken <a> tag in left nav, from CL: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871

Change-Id: I56fb67536aef6ba479361b86090d1106830513a3

8 years agoMerge "docs: Tools docs reorganization, round 1b" into mnc-docs
Joe Fernandez [Tue, 9 Feb 2016 05:44:34 +0000 (05:44 +0000)]
Merge "docs: Tools docs reorganization, round 1b" into mnc-docs
am: 61bfb81f5d

* commit '61bfb81f5d7217fe81f4100456c51ee840a35eb4':
  docs: Tools docs reorganization, round 1b

8 years agoMerge "docs: Tools docs reorganization, round 1b" into mnc-docs
Joe Fernandez [Tue, 9 Feb 2016 05:38:19 +0000 (05:38 +0000)]
Merge "docs: Tools docs reorganization, round 1b" into mnc-docs

8 years agodocs: Tools docs reorganization, round 1b
Joe Fernandez [Thu, 19 Nov 2015 02:53:39 +0000 (18:53 -0800)]
docs: Tools docs reorganization, round 1b

b/25522909

Change-Id: I54d51eeedf122648026bd013cfceac3f32629b7e

8 years agoMerge "Docs: Updated TOC to reflect CL 814501" into mnc-docs
Doug Kramer [Tue, 9 Feb 2016 01:45:11 +0000 (01:45 +0000)]
Merge "Docs: Updated TOC to reflect CL 814501" into mnc-docs
am: d3d5958666

* commit 'd3d59586662ff443cccb6636de96aac60c4ec31b':
  Docs: Updated TOC to reflect CL 814501

8 years agoMerge "Docs: Updated TOC to reflect CL 814501" into mnc-docs
Doug Kramer [Tue, 9 Feb 2016 01:40:21 +0000 (01:40 +0000)]
Merge "Docs: Updated TOC to reflect CL 814501" into mnc-docs

8 years agoMerge "docs: Replaced ?s with quotation marks." into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:37:49 +0000 (01:37 +0000)]
Merge "docs: Replaced ?s with quotation marks." into mnc-docs
am: e32497ba43

* commit 'e32497ba43610c0957e2bd74b066aebbacc94ca7':
  docs: Replaced ?s with quotation marks.

8 years agoMerge "docs: Removed an extra quotation mark from snippet" into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:36:44 +0000 (01:36 +0000)]
Merge "docs: Removed an extra quotation mark from snippet" into mnc-docs
am: 75d2f9a102

* commit '75d2f9a1029deaba4a5e38d192b4181ca25635f6':
  docs: Removed an extra quotation mark from snippet

8 years agoMerge "docs: Replaced ?s with quotation marks." into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:34:22 +0000 (01:34 +0000)]
Merge "docs: Replaced ?s with quotation marks." into mnc-docs

8 years agoMerge "docs: Removed an extra quotation mark from snippet" into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:33:42 +0000 (01:33 +0000)]
Merge "docs: Removed an extra quotation mark from snippet" into mnc-docs

8 years agoMerge "docs: Fixed typo in \'Creating an Android Module\'" into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:26:29 +0000 (01:26 +0000)]
Merge "docs: Fixed typo in \'Creating an Android Module\'" into mnc-docs
am: 1a868a18fa

* commit '1a868a18fa68982d342dbb52fd077630680a372f':
  docs: Fixed typo in 'Creating an Android Module'

8 years agoMerge "docs: Fixed typo in 'Creating an Android Module'" into mnc-docs
Eric Schmidt [Tue, 9 Feb 2016 01:22:06 +0000 (01:22 +0000)]
Merge "docs: Fixed typo in 'Creating an Android Module'" into mnc-docs

8 years agoDocs: Updated TOC to reflect CL 814501
Doug Kramer [Tue, 9 Feb 2016 01:19:02 +0000 (17:19 -0800)]
Docs: Updated TOC to reflect CL 814501

Change-Id: Id5905a471e052a69a655b1dd7a053963f1c5900f

8 years agoMerge "docs: Battery performance, networking analysis and optimization" into mnc...
Doug Kramer [Tue, 9 Feb 2016 01:02:30 +0000 (01:02 +0000)]
Merge "docs: Battery performance, networking analysis and optimization" into mnc-docs
am: 406daa4441

* commit '406daa4441577b8aa83689e69614b3406da4878d':
  docs: Battery performance, networking analysis and optimization

8 years agoMerge "docs: Battery performance, networking analysis and optimization" into mnc...
Doug Kramer [Tue, 9 Feb 2016 00:48:41 +0000 (00:48 +0000)]
Merge "docs: Battery performance, networking analysis and optimization" into mnc-docs

8 years agodocs: Battery performance, networking analysis and optimization
Joe Fernandez [Sat, 17 Oct 2015 18:05:04 +0000 (11:05 -0700)]
docs: Battery performance, networking analysis and optimization

- added draft TOC structure to training
- added battery/networking training pages

Change-Id: I0136898f37feac9a8ea17de24ea5ef1bf0ce5329

8 years agodocs: Removed an extra quotation mark from snippet
Eric Schmidt [Sat, 6 Feb 2016 00:16:27 +0000 (16:16 -0800)]
docs: Removed an extra quotation mark from snippet

Bug: 26486723
Change-Id: Id9fb344c7138ec858dd74d3d562a6061c6936abd

8 years agodocs: Replaced ?s with quotation marks.
Eric Schmidt [Mon, 8 Feb 2016 18:34:53 +0000 (10:34 -0800)]
docs: Replaced ?s with quotation marks.

Bug: 26349836
Change-Id: I00a742cd6bee9d4c9882ee953267e75e195e3bfc

8 years agodocs: Fixed typo in 'Creating an Android Module'
Eric Schmidt [Mon, 8 Feb 2016 21:26:04 +0000 (13:26 -0800)]
docs: Fixed typo in 'Creating an Android Module'

Bug: 27071132
Change-Id: Ie3bf5f524c7753c5668e3cf89545892163a2596c

8 years agoFix bug in IntentService and Service example code.
Florian Salbrechter [Mon, 8 Feb 2016 20:02:14 +0000 (20:02 +0000)]
Fix bug in IntentService and Service example code.
am: adde150c02

* commit 'adde150c02e45ff6219445c4a5b04d2e9ee1f1b4':
  Fix bug in IntentService and Service example code.

8 years agoFix bug in IntentService and Service example code.
Florian Salbrechter [Mon, 8 Feb 2016 13:36:43 +0000 (13:36 +0000)]
Fix bug in IntentService and Service example code.

Use Thread.sleep instead of Object.wait which simplifies the example.
Also there is a tiny chance, that wait will be called with 0, which
blocks forever.

Change-Id: I4cf90a33089a64bdf802620350f76af08f15f721
(cherry picked from commit 77d8857ed58503669e0659989c02fb7f1ca936b4)

8 years agoAdd preview docs dir, toc, and basic files.
Dirk Dougherty [Sun, 7 Feb 2016 02:24:32 +0000 (18:24 -0800)]
Add preview docs dir, toc, and basic files.

Change-Id: I890dd21fed1217e4429f269eed5bada9a6faf2b4

8 years agoMerge "docs: Fix function name" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:24:28 +0000 (23:24 +0000)]
Merge "docs: Fix function name" into mnc-docs
am: 3b686b3c01

* commit '3b686b3c01785a1ed77335391ffb79f7a18e8514':
  docs: Fix function name

8 years agoMerge "docs: Fix typo "allows the application can recognize" -> to" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:23:28 +0000 (23:23 +0000)]
Merge "docs: Fix typo "allows the application can recognize" -> to" into mnc-docs
am: 2bcde9fa9a

* commit '2bcde9fa9ae6d167612d4520f5dffdeafaf54e17':
  docs: Fix typo "allows the application can recognize" -> to

8 years agoMerge "docs: Fix function name" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:21:16 +0000 (23:21 +0000)]
Merge "docs: Fix function name" into mnc-docs

8 years agoMerge "docs: Fix typo "allows the application can recognize" -> to" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:20:53 +0000 (23:20 +0000)]
Merge "docs: Fix typo "allows the application can recognize" -> to" into mnc-docs

8 years agoMerge "docs: Fix typo "ability [to] return"" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:15:51 +0000 (23:15 +0000)]
Merge "docs: Fix typo "ability [to] return"" into mnc-docs
am: 4b8bc437ff

* commit '4b8bc437ff59651882f60718737ed0ef8f9cf991':
  docs: Fix typo "ability [to] return"

8 years agoMerge "docs: Fix "what what" typo" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:13:28 +0000 (23:13 +0000)]
Merge "docs: Fix "what what" typo" into mnc-docs
am: 6ec812ab49

* commit '6ec812ab49d74acbbd11e4ffc68dd78f96631861':
  docs: Fix "what what" typo

8 years agodocs: Fix typo "[singular] attributes specifies"
Dan Dascalescu [Fri, 5 Feb 2016 23:11:51 +0000 (23:11 +0000)]
docs: Fix typo "[singular] attributes specifies"
am: 2c506fcf9d

* commit '2c506fcf9d0ca1cc446aaa66a7601616c2954d7f':
  docs: Fix typo "[singular] attributes specifies"

8 years agoMerge "docs: Fix typo "ability [to] return"" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:11:47 +0000 (23:11 +0000)]
Merge "docs: Fix typo "ability [to] return"" into mnc-docs

8 years agoMerge "docs: Fix "what what" typo" into mnc-docs
Dan Dascalescu [Fri, 5 Feb 2016 23:10:20 +0000 (23:10 +0000)]
Merge "docs: Fix "what what" typo" into mnc-docs

8 years agodocs: Documentation for using China variant of the Android Wear
sreevanis [Wed, 13 Jan 2016 20:18:56 +0000 (12:18 -0800)]
docs: Documentation for using China variant of the Android Wear
SDK.

Bug:24924597
Change-Id: I95781d48e354268cca44e463693eaade0c3c469c

8 years agodocs: Fix typo "[singular] attributes specifies"
Dan Dascalescu [Fri, 5 Feb 2016 02:38:19 +0000 (18:38 -0800)]
docs: Fix typo "[singular] attributes specifies"

bug: https://code.google.com/p/android/issues/detail?id=196193
Change-Id: I69fb6dcb6bbb5912ef3f3697d0b658e07ebddfa4

8 years agodocs: Fix typo "allows the application can recognize" -> to
Dan Dascalescu [Fri, 5 Feb 2016 01:39:17 +0000 (17:39 -0800)]
docs: Fix typo "allows the application can recognize" -> to

bug: https://code.google.com/p/android/issues/detail?id=28854
Change-Id: Ifee2f44309c880ffe1f9df55b4a2a7fb3ae7c149

8 years agodocs: Fix typo behavrio -> behavior
Dan Dascalescu [Fri, 5 Feb 2016 01:31:37 +0000 (17:31 -0800)]
docs: Fix typo behavrio -> behavior

bug: https://code.google.com/p/android/issues/detail?id=26491
Change-Id: Idf8597eadb81320f41d420d0e8669524dca66cfd

8 years agodocs: Fix typo mimeType:name -> android:mimeType
Dan Dascalescu [Fri, 5 Feb 2016 01:20:23 +0000 (17:20 -0800)]
docs: Fix typo mimeType:name -> android:mimeType

bug: https://code.google.com/p/android/issues/detail?id=37519
Change-Id: I9a22be7728151895b4fdaf7fbbdf2cb266190abe

8 years agodocs: Fix typo "ability [to] return"
Dan Dascalescu [Fri, 5 Feb 2016 01:18:30 +0000 (17:18 -0800)]
docs: Fix typo "ability [to] return"

bug: https://code.google.com/p/android/issues/detail?id=37519
Change-Id: I2367634a228f8aaa5e456ef7ea85a23818378d28

8 years agodocs: Fix "Spenned" typo
Dan Dascalescu [Fri, 5 Feb 2016 01:13:32 +0000 (17:13 -0800)]
docs: Fix "Spenned" typo

bug: https://code.google.com/p/android/issues/detail?id=54792
Change-Id: Ie748671da52b140e1e709853d6ef9125b49c911c

8 years agodocs: Fix "what what" typo
Dan Dascalescu [Fri, 5 Feb 2016 01:09:19 +0000 (17:09 -0800)]
docs: Fix "what what" typo

bug: https://code.google.com/p/android/issues/detail?id=52264
Change-Id: Iba8dfb9bd18251960fee13b0464d99a92e48eb9c

8 years agodocs: Fix function name
Dan Dascalescu [Fri, 5 Feb 2016 00:19:38 +0000 (16:19 -0800)]
docs: Fix function name

bug: https://code.google.com/p/android/issues/detail?id=27174
Change-Id: I72fd7e22838b71a678185601d97ae7e238812b92

8 years agoMerge "docs: Deep Link and App Indexing API Support in Android Studio 1.5 b/25391753...
Cheryl Potter [Thu, 4 Feb 2016 19:53:25 +0000 (19:53 +0000)]
Merge "docs: Deep Link and App Indexing API Support in Android Studio 1.5 b/25391753" into mnc-docs
am: 611c2e0ede

* commit '611c2e0ede19ae455956471f42d1577da69119c7':
  docs: Deep Link and App Indexing API Support in Android Studio 1.5 b/25391753

8 years agoMerge "docs: Deep Link and App Indexing API Support in Android Studio 1.5 b/25391753...
Cheryl Potter [Thu, 4 Feb 2016 19:49:25 +0000 (19:49 +0000)]
Merge "docs: Deep Link and App Indexing API Support in Android Studio 1.5 b/25391753" into mnc-docs

8 years agodocs: Deep Link and App Indexing API Support in Android Studio 1.5
Cheryl Potter [Fri, 29 Jan 2016 00:05:05 +0000 (16:05 -0800)]
docs: Deep Link and App Indexing API Support in Android Studio 1.5
b/25391753

Change-Id: I05a5e829c572a811a4e84afd238d31c69c9a8e83

8 years agoMerge "Docs: Fixed misspelled word in build.png: "Reources" > "Resources"" into mnc...
Adarsh Fernando [Thu, 4 Feb 2016 18:20:50 +0000 (18:20 +0000)]
Merge "Docs: Fixed misspelled word in build.png: "Reources" > "Resources"" into mnc-docs
am: f6870582ef

* commit 'f6870582ef5f28c048450e9927b8bb6cc1343f9b':
  Docs: Fixed misspelled word in build.png: "Reources" > "Resources"

8 years agoMerge "docs: Fixed text and Kovio links." into mnc-docs
Eric Schmidt [Thu, 4 Feb 2016 18:19:48 +0000 (18:19 +0000)]
Merge "docs: Fixed text and Kovio links." into mnc-docs
am: 00f2aaad15

* commit '00f2aaad15b481fae193baa05d6884152ef2cc6d':
  docs: Fixed text and Kovio links.

8 years agoMerge "Docs: Fixed misspelled word in build.png: "Reources" > "Resources"" into mnc...
Adarsh Fernando [Thu, 4 Feb 2016 18:18:19 +0000 (18:18 +0000)]
Merge "Docs: Fixed misspelled word in build.png: "Reources" > "Resources"" into mnc-docs

8 years agoMerge "docs: Fixed text and Kovio links." into mnc-docs
Eric Schmidt [Thu, 4 Feb 2016 18:16:55 +0000 (18:16 +0000)]
Merge "docs: Fixed text and Kovio links." into mnc-docs

8 years agoDocs: Fixed misspelled word in build.png: "Reources" > "Resources"
Adarsh Fernando [Thu, 4 Feb 2016 02:28:50 +0000 (18:28 -0800)]
Docs: Fixed misspelled word in build.png: "Reources" > "Resources"

Bug: 23617602
Change-Id: Id8fe42139b41daa96601634d1592afe697277872

8 years agoMerge "Delete redundant heading." into mnc-docs
Scott Main [Wed, 3 Feb 2016 22:28:07 +0000 (22:28 +0000)]
Merge "Delete redundant heading." into mnc-docs
am: 556e677a3b

* commit '556e677a3b2aff1579cfd2b396fb122e482b746a':
  Delete redundant heading.

8 years agoMerge "Delete redundant heading." into mnc-docs
Scott Main [Wed, 3 Feb 2016 22:24:24 +0000 (22:24 +0000)]
Merge "Delete redundant heading." into mnc-docs

8 years agoMerge "b/25963771 docs: 64-bit Linux now required b/26288626" into mnc-docs
Cheryl Potter [Wed, 3 Feb 2016 18:07:42 +0000 (18:07 +0000)]
Merge "b/25963771 docs: 64-bit Linux now required b/26288626" into mnc-docs
am: 0db3a27b33

* commit '0db3a27b33f02c4ae995163c7b27c76d2d5a5622':
  b/25963771 docs: 64-bit Linux now required b/26288626

8 years agoMerge "b/25963771 docs: 64-bit Linux now required b/26288626" into mnc-docs
Cheryl Potter [Wed, 3 Feb 2016 18:02:46 +0000 (18:02 +0000)]
Merge "b/25963771 docs: 64-bit Linux now required b/26288626" into mnc-docs

8 years agob/25963771
Cheryl Potter [Sat, 30 Jan 2016 02:22:05 +0000 (18:22 -0800)]
b/25963771
docs: 64-bit Linux now required
b/26288626

Change-Id: I0291b1dab9603ba2f4230ac9d1477c484c90f0cd

8 years agoMerge "docs: Removed extraneous parens from article" into mnc-docs
Eric Schmidt [Tue, 2 Feb 2016 20:00:11 +0000 (20:00 +0000)]
Merge "docs: Removed extraneous parens from article" into mnc-docs
am: 4b1812b7ba

* commit '4b1812b7ba3767abfe0dfc7bd12bcae7b330b874':
  docs: Removed extraneous parens from article

8 years agoMerge "docs: Removed extraneous parens from article" into mnc-docs
Eric Schmidt [Tue, 2 Feb 2016 19:57:11 +0000 (19:57 +0000)]
Merge "docs: Removed extraneous parens from article" into mnc-docs

8 years agoMerge "docs: Fix description line truncated by "e.g."" into mnc-docs
Dan Dascalescu [Tue, 2 Feb 2016 19:53:29 +0000 (19:53 +0000)]
Merge "docs: Fix description line truncated by "e.g."" into mnc-docs
am: 556ca38a6f

* commit '556ca38a6f5e03016aae4d77a93da7aa1d1716f9':
  docs: Fix description line truncated by "e.g."

8 years agoMerge "docs: ACTION_PACKAGE_REMOVED installed -> removed; EOL fixes" into mnc-docs
Dan Dascalescu [Tue, 2 Feb 2016 19:50:50 +0000 (19:50 +0000)]
Merge "docs: ACTION_PACKAGE_REMOVED installed -> removed; EOL fixes" into mnc-docs
am: abc8fe0365

* commit 'abc8fe0365260e6a42d0b47c639c3e8f6230e74f':
  docs: ACTION_PACKAGE_REMOVED installed -> removed; EOL fixes

8 years agoMerge "docs: Fix description line truncated by "e.g."" into mnc-docs
Dan Dascalescu [Tue, 2 Feb 2016 19:49:14 +0000 (19:49 +0000)]
Merge "docs: Fix description line truncated by "e.g."" into mnc-docs

8 years agoMerge "docs: ACTION_PACKAGE_REMOVED installed -> removed; EOL fixes" into mnc-docs
Dan Dascalescu [Tue, 2 Feb 2016 19:48:02 +0000 (19:48 +0000)]
Merge "docs: ACTION_PACKAGE_REMOVED installed -> removed; EOL fixes" into mnc-docs

8 years agoFix spelling of OpenSL ES
Glenn Kasten [Tue, 2 Feb 2016 19:00:30 +0000 (19:00 +0000)]
Fix spelling of OpenSL ES
am: 6ce8190f3b

* commit '6ce8190f3bdf400953647a0950010906124006f8':
  Fix spelling of OpenSL ES

8 years agoFix spelling of OpenSL ES
Glenn Kasten [Tue, 2 Feb 2016 18:47:35 +0000 (10:47 -0800)]
Fix spelling of OpenSL ES

Change-Id: I247b8d75e250ed5e5566ad76526f8ba7afb38f72

8 years agoMerge "Remove beta notification for data binding and add a few docs." into mnc-docs
George Mount [Tue, 2 Feb 2016 15:58:23 +0000 (15:58 +0000)]
Merge "Remove beta notification for data binding and add a few docs." into mnc-docs
am: d668729fbe

* commit 'd668729fbe38d9b07666e9c7d02bbacd4a87dd83':
  Remove beta notification for data binding and add a few docs.

8 years agoMerge "Remove beta notification for data binding and add a few docs." into mnc-docs
George Mount [Tue, 2 Feb 2016 15:53:10 +0000 (15:53 +0000)]
Merge "Remove beta notification for data binding and add a few docs." into mnc-docs

8 years agoMerge "docs: Updated existing auto index page images due to updated UI." into mnc...
Sreevani Sreejith [Tue, 2 Feb 2016 04:48:39 +0000 (04:48 +0000)]
Merge "docs: Updated existing auto index page images due to updated UI." into mnc-docs
am: 5ac90e86c5

* commit '5ac90e86c5c6c5c8bdc2c60e9e1dcf8e4b6d2294':
  docs: Updated existing auto index page images due to updated UI.

8 years agoMerge "docs: Added the new H2 "Determine if your App is Connected" to TOC and fixed...
Sreevani Sreejith [Tue, 2 Feb 2016 04:47:35 +0000 (04:47 +0000)]
Merge "docs: Added the new H2 "Determine if your App is Connected" to TOC and fixed some typos." into mnc-docs
am: 8d27854a38

* commit '8d27854a38e053716cf48afb918b65eb2b974332':
  docs: Added the new H2 "Determine if your App is Connected" to TOC and fixed some typos.

8 years agoMerge "docs: Updated existing auto index page images due to updated UI." into mnc...
Sreevani Sreejith [Tue, 2 Feb 2016 04:46:02 +0000 (04:46 +0000)]
Merge "docs: Updated existing auto index page images due to updated UI." into mnc-docs

8 years agoMerge "docs: Added the new H2 "Determine if your App is Connected" to TOC and fixed...
Sreevani Sreejith [Tue, 2 Feb 2016 04:45:01 +0000 (04:45 +0000)]
Merge "docs: Added the new H2 "Determine if your App is Connected" to TOC and fixed some typos." into mnc-docs

8 years agoMerge "Docs: Add Audio (OpenSL ES) section to NDK docs on DAC." into mnc-docs
David Friedman [Tue, 2 Feb 2016 04:37:08 +0000 (04:37 +0000)]
Merge "Docs: Add Audio (OpenSL ES) section to NDK docs on DAC." into mnc-docs
am: bf80159a17

* commit 'bf80159a1769b74aa26586d4c5011269a338255c':
  Docs: Add Audio (OpenSL ES) section to NDK docs on DAC.