OSDN Git Service

android-x86/frameworks-base.git
9 years agoam eba8ba53: Merge "Docs: Removing "TODO"s, and adding a couple of links to reference...
David Friedman [Thu, 28 May 2015 01:05:37 +0000 (01:05 +0000)]
am eba8ba53: Merge "Docs: Removing "TODO"s, and adding a couple of links to reference docs." into mnc-preview-docs

* commit 'eba8ba533da349605d068086980abc86c3a13812':
  Docs: Removing "TODO"s, and adding a couple of links to reference docs.

9 years agoam 1311bbd7: Merge "docs: program overview page typo \'how support permissions and...
Rich Slogar [Thu, 28 May 2015 01:05:33 +0000 (01:05 +0000)]
am 1311bbd7: Merge "docs: program overview page typo \'how support permissions and\'" into mnc-preview-docs

* commit '1311bbd7f7e58887a42a080fc2fdd382106c5924':
  docs: program overview page typo 'how support permissions and'

9 years agoam a2c9a045: docs: Fixing typo in app-linking.html
Andrew Solovay [Thu, 28 May 2015 01:05:28 +0000 (01:05 +0000)]
am a2c9a045: docs: Fixing typo in app-linking.html

* commit 'a2c9a045b2aff63f42a25153a60bc96ae673b371':
  docs: Fixing typo in app-linking.html

9 years agoMerge "Docs: Removing "TODO"s, and adding a couple of links to reference docs." into...
David Friedman [Thu, 28 May 2015 00:49:15 +0000 (00:49 +0000)]
Merge "Docs: Removing "TODO"s, and adding a couple of links to reference docs." into mnc-preview-docs

9 years agoMerge "docs: program overview page typo 'how support permissions and'" into mnc-previ...
Rich Slogar [Thu, 28 May 2015 00:47:51 +0000 (00:47 +0000)]
Merge "docs: program overview page typo 'how support permissions and'" into mnc-preview-docs

9 years agodocs: program overview page typo 'how support permissions and'
Rich Slogar [Thu, 28 May 2015 00:43:50 +0000 (17:43 -0700)]
docs: program overview page typo 'how support permissions and'

Change-Id: I5fb1f8ec670d26ad35dde97b47f2291bce08874e

9 years agoDocs: Removing "TODO"s, and adding a couple of links to reference docs.
David Friedman [Thu, 28 May 2015 00:05:56 +0000 (17:05 -0700)]
Docs: Removing "TODO"s, and adding a couple of links to reference docs.

Change-Id: I34fe6acee2fdf777e8b78a5ab8c46393bb7f0f3e

9 years agoam 0b6ff63b: Merge "docs: Changed "Runtime Permissions" doc to "Permissions"" into...
Andrew Solovay [Thu, 28 May 2015 00:37:59 +0000 (00:37 +0000)]
am 0b6ff63b: Merge "docs: Changed "Runtime Permissions" doc to "Permissions"" into mnc-preview-docs

* commit '0b6ff63bd6ebbe21e737cee550ed1b1c93f40cb6':
  docs: Changed "Runtime Permissions" doc to "Permissions"

9 years agoam 849da88c: Merge "docs: Clarified the SDK install instructions." into mnc-preview...
Andrew Solovay [Thu, 28 May 2015 00:37:55 +0000 (00:37 +0000)]
am 849da88c: Merge "docs: Clarified the SDK install instructions." into mnc-preview-docs

* commit '849da88c4d53ba7b0000751ec9818b06a59dbf37':
  docs: Clarified the SDK install instructions.

9 years agoam 416e3f82: Merge "docs: Fixing typo in app-linking doc" into mnc-preview-docs
Andrew Solovay [Thu, 28 May 2015 00:37:51 +0000 (00:37 +0000)]
am 416e3f82: Merge "docs: Fixing typo in app-linking doc" into mnc-preview-docs

* commit '416e3f826d0faa053b9f9cfceec63290a4fbfccf':
  docs: Fixing typo in app-linking doc

9 years agodocs: Fixing typo in app-linking.html
Andrew Solovay [Thu, 28 May 2015 00:30:29 +0000 (17:30 -0700)]
docs: Fixing typo in app-linking.html

bug: 21474324
Change-Id: I66a2e3d0b4c7eebcbc1e387d3f64d73c68288b3a

9 years agoMerge "docs: Changed "Runtime Permissions" doc to "Permissions"" into mnc-preview...
Andrew Solovay [Thu, 28 May 2015 00:22:29 +0000 (00:22 +0000)]
Merge "docs: Changed "Runtime Permissions" doc to "Permissions"" into mnc-preview-docs

9 years agoMerge "docs: Clarified the SDK install instructions." into mnc-preview-docs
Andrew Solovay [Thu, 28 May 2015 00:19:07 +0000 (00:19 +0000)]
Merge "docs: Clarified the SDK install instructions." into mnc-preview-docs

9 years agoMerge "docs: Fixing typo in app-linking doc" into mnc-preview-docs
Andrew Solovay [Thu, 28 May 2015 00:18:54 +0000 (00:18 +0000)]
Merge "docs: Fixing typo in app-linking doc" into mnc-preview-docs

9 years agodocs: Fixing typo in app-linking doc
Andrew Solovay [Thu, 28 May 2015 00:09:58 +0000 (17:09 -0700)]
docs: Fixing typo in app-linking doc

bug: 21474283
Change-Id: I0e29db2b40478b9e0ec01039ccf747f659af7317

9 years agoam 7df68812: Merge "docs: NDK site - fix empty landing page section" into mnc-preview...
Joe Fernandez [Wed, 27 May 2015 23:58:24 +0000 (23:58 +0000)]
am 7df68812: Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs

* commit '7df688121480c5c13ab6a3d8932c286bc2d63e65':
  docs: NDK site - fix empty landing page section

9 years agoMerge "docs: NDK site - fix empty landing page section" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 23:45:25 +0000 (23:45 +0000)]
Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs

9 years agodocs: NDK site - fix empty landing page section
Joe Fernandez [Wed, 27 May 2015 22:55:57 +0000 (15:55 -0700)]
docs: NDK site - fix empty landing page section

b/21461174

Change-Id: I8ad4ace747c90b5c30398112e38705956ec4ab1d

9 years agodocs: Changed "Runtime Permissions" doc to "Permissions"
Andrew Solovay [Wed, 27 May 2015 19:55:51 +0000 (12:55 -0700)]
docs: Changed "Runtime Permissions" doc to "Permissions"

Per message from Joe, changed name of feature from "Runtime
Permissions" to just "Permissions". Still sometimes referred to it as
"runtime permissions" in descriptive text, as appropriate.

I considered renaming the feature page to ./permissions.jd , but
given the short time, I decided against it--there were too many
ways a file rename could break things, and this is just a temporary
"preview" page anyway.

See first comment for stage location.

Change-Id: I0ce36d99ea2377cf9fa7ac72b2f182dedb5c38e8

9 years agoam 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite launch." into...
David Friedman [Wed, 27 May 2015 23:04:52 +0000 (23:04 +0000)]
am 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview-docs

* commit '772dab7b24ce8be1e8f0e57ad6f5ba2bfa0203ee':
  Docs: Final work on Reference tab for NDK minisite launch.

9 years agoMerge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview...
David Friedman [Wed, 27 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview-docs

9 years agoDocs: Final work on Reference tab for NDK minisite launch.
David Friedman [Wed, 27 May 2015 21:45:39 +0000 (14:45 -0700)]
Docs: Final work on Reference tab for NDK minisite launch.

Change-Id: Ia633e7664012c77c46a6e4ba894d60592bde8b09

9 years agodocs: Clarified the SDK install instructions.
Andrew Solovay [Wed, 27 May 2015 18:07:35 +0000 (11:07 -0700)]
docs: Clarified the SDK install instructions.

Noted that you need Android Studio 1.3 (canary) to test the M
Developer Preview, and added a section on how to install that.
Updated the "install the SDK" section to match AS 1.3's workflow.

Also removed reference to Nexus Player (per separate bug).

See first comment for doc stage location.

bug: 21422334
bug: 21425728
Change-Id: If8c62e074b883b4ba33753ac799b0a79739843b8

9 years agoam 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:41:19 +0000 (22:41 +0000)]
am 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser

* commit '6ea840d15e66a5d2ba6e70f9e07ff59adb4d6d2a':
  Add 'System' group to DAC sample browser

9 years agoam 4cbe359a: Add \'System\' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:22:53 +0000 (22:22 +0000)]
am 4cbe359a: Add \'System\' group to DAC sample browser

* commit '4cbe359abe26d749b1dbc9cf489a825af0cad005':
  Add 'System' group to DAC sample browser

9 years agoam 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 22:14:20 +0000 (22:14 +0000)]
am 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs

* commit '91a90991248b60b07674c321aca19f23f1f2b51e':
  docs: M Preview - System Image Downloads

9 years agoam f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview...
David Friedman [Wed, 27 May 2015 22:14:05 +0000 (22:14 +0000)]
am f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs

* commit 'f7883698e19eafd678dfdb2af5a470b30f5153c8':
  Docs: Samples-tab material for NDK minisite.

9 years agoMerge "docs: M Preview - System Image Downloads" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 22:10:38 +0000 (22:10 +0000)]
Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs

9 years agodocs: M Preview - System Image Downloads
Joe Fernandez [Wed, 27 May 2015 22:04:22 +0000 (15:04 -0700)]
docs: M Preview - System Image Downloads

Change-Id: I0f88dea54b47512c7f4eb76b72c5bcba0bca41ed

9 years agoMerge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs
David Friedman [Wed, 27 May 2015 22:00:55 +0000 (22:00 +0000)]
Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs

9 years agoDocs: Samples-tab material for NDK minisite.
David Friedman [Wed, 27 May 2015 17:35:55 +0000 (10:35 -0700)]
Docs: Samples-tab material for NDK minisite.

Change-Id: I0ae1bf83feb2a8cab97e3911f7069b19ae818ffa

9 years agoAdd 'System' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 21:50:51 +0000 (14:50 -0700)]
Add 'System' group to DAC sample browser

Bug: 19708211
Change-Id: I55ad484647b859fce6c59f0e147523a8a709a527

9 years agoam 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558f...
Leon Scroggins III [Wed, 27 May 2015 20:31:41 +0000 (20:31 +0000)]
am 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '650f688c17f1439ac0e555668e4c454c3a3d273a':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace7...
Leon Scroggins III [Wed, 27 May 2015 20:31:37 +0000 (20:31 +0000)]
am 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '1b4eed5659a4ac6e4a9f276c7f63da7dda4fa3b7':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 4575cadc: docs: supportlib icon fix
Rich Slogar [Wed, 27 May 2015 20:21:30 +0000 (20:21 +0000)]
am 4575cadc: docs: supportlib icon fix

* commit '4575cadc54ed2c574a6198b7247a774c5f8297cb':
  docs: supportlib icon fix

9 years agoam 5904628c: docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:21:25 +0000 (20:21 +0000)]
am 5904628c: docs: Remove Voice Camera sample.

* commit '5904628c89a1757be9fde4983d4e7f8cff28eb7c':
  docs: Remove Voice Camera sample.

9 years agoam 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc...
Luan Nguyen [Wed, 27 May 2015 20:21:20 +0000 (20:21 +0000)]
am 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs

* commit '5380cb6a8880fc6622bd669bc06321c20e1320d9':
  docs: Remove 's' from Confirm Credential sample.

9 years agoam 47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 20:21:15 +0000 (20:21 +0000)]
am 47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs

* commit '47badfebebec011fb6df48360c647c6ec15800ff':
  docs: M Preview - App links fix update

9 years agoam 27ce77ac: Merge "docs: Update instructions to download samples in Android Studio...
Luan Nguyen [Wed, 27 May 2015 20:21:11 +0000 (20:21 +0000)]
am 27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs

* commit '27ce77acfda17b04d14e70d5f30c160f72ad8733':
  docs: Update instructions to download samples in Android Studio.

9 years agoam 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c8...
Leon Scroggins III [Wed, 27 May 2015 20:20:42 +0000 (20:20 +0000)]
am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '6bf7bfb5d2b0693b8b1c4126eea7624e5cfb29f7':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge...
Leon Scroggins III [Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)]
am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '557ee34d97c435e19034235aff258aea093efc3f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agodocs: supportlib icon fix
Rich Slogar [Wed, 27 May 2015 20:03:14 +0000 (13:03 -0700)]
docs: supportlib icon fix

Change-Id: I423271109e479a8bacc8edb44801dcb5c05ef634

9 years agodocs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 18:58:52 +0000 (11:58 -0700)]
docs: Remove Voice Camera sample.

Change-Id: I65ac20c33be9820519c0eb0e931272a0ef9bb34f

9 years agoam f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into...
Andrew Solovay [Wed, 27 May 2015 18:54:52 +0000 (18:54 +0000)]
am f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs

* commit 'f0560097eef030d3bf65132c974dbc2f6b1cb681':
  docs: Fixed targetSdkVersion in Auto Backup code snippets

9 years agoam aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-previ...
Rich Slogar [Wed, 27 May 2015 18:54:48 +0000 (18:54 +0000)]
am aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs

* commit 'aa3d35e677e027bf9a8a17c59b6507e588a1b9cb':
  docs: support library 22.2 duplicate link removal

9 years agoam b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview...
Andrew Solovay [Wed, 27 May 2015 18:54:42 +0000 (18:54 +0000)]
am b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs

* commit 'b7227c2bf9f1893c5d9778a8344b1bfe6394c4d3':
  docs: Fixing typo on Auto Backup for Apps page.

9 years agoam be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides,"...
David Friedman [Wed, 27 May 2015 18:54:37 +0000 (18:54 +0000)]
am be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs

* commit 'be4fc248b72e27dad6f677910566226c7dd9d670':
  Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.

9 years agoam 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop...
Quddus Chong [Wed, 27 May 2015 18:54:31 +0000 (18:54 +0000)]
am 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467" into mnc-preview-docs

* commit '8525b8a8b54e2f97839cb80eee79404ab196c2db':
  docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467

9 years agoMerge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 18:52:32 +0000 (18:52 +0000)]
Merge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs

9 years agodocs: Remove 's' from Confirm Credential sample.
Luan Nguyen [Wed, 27 May 2015 18:51:14 +0000 (11:51 -0700)]
docs: Remove 's' from Confirm Credential sample.

Change-Id: I4b33fec58014c54594210e0f5f4e759393adc618

9 years agoMerge "docs: M Preview - App links fix update" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 18:51:07 +0000 (18:51 +0000)]
Merge "docs: M Preview - App links fix update" into mnc-preview-docs

9 years agodocs: M Preview - App links fix update
Joe Fernandez [Wed, 27 May 2015 18:28:36 +0000 (11:28 -0700)]
docs: M Preview - App links fix update

- final comments
- naming change to "App Links"

Change-Id: I2c8f105e0b75f95ca2e9d6bb86fd85d21dcd3326

9 years agoMerge "docs: Update instructions to download samples in Android Studio." into mnc...
Luan Nguyen [Wed, 27 May 2015 18:22:38 +0000 (18:22 +0000)]
Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs

9 years agodocs: Update instructions to download samples in Android Studio.
Luan Nguyen [Wed, 27 May 2015 15:51:32 +0000 (08:51 -0700)]
docs: Update instructions to download samples in Android Studio.

bug: 21425873
Change-Id: I0e5710c08f7fbe5f92ca16b366ea14a1b05d491a

9 years agoam 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 1129758...
Leon Scroggins III [Wed, 27 May 2015 17:52:58 +0000 (17:52 +0000)]
am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '4b2d2add3fc1068645790a0bace239b9d868dd30':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel...
Leon Scroggins III [Wed, 27 May 2015 17:52:51 +0000 (17:52 +0000)]
am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview...
Andrew Solovay [Wed, 27 May 2015 17:41:05 +0000 (17:41 +0000)]
Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs

9 years agoMerge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
Rich Slogar [Wed, 27 May 2015 17:38:48 +0000 (17:38 +0000)]
Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs

9 years agodocs: Fixed targetSdkVersion in Auto Backup code snippets
Andrew Solovay [Wed, 27 May 2015 02:57:52 +0000 (19:57 -0700)]
docs: Fixed targetSdkVersion in Auto Backup code snippets

Changed targetSdkVerion from "android-MNC" to "MNC". Also--per
preview/setup-sdk.html -- changed the minSdkVersion to "MNC" in
both places (if people are building apps for the preview release,
the minimum SDK version has to be MNC to keep the app from getting
installed onto devices running production Android).

See first comment for doc stage location.

bug: 21443485
Change-Id: I4cc5f16d53cd795b2db156c99db7c46f14d0ce65

9 years agoam 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d7926...
Leon Scroggins III [Wed, 27 May 2015 17:34:55 +0000 (17:34 +0000)]
am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '958a7c1cd816986ac58073ae415b0825c0a11b7b':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the...
Leon Scroggins III [Wed, 27 May 2015 17:34:51 +0000 (17:34 +0000)]
am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit 'b6e3f930c182ed254e7de3b3e5d22bc7323227f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
Andrew Solovay [Wed, 27 May 2015 17:23:56 +0000 (17:23 +0000)]
Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs

9 years agoam 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check...
Leon Scroggins III [Wed, 27 May 2015 17:18:54 +0000 (17:18 +0000)]
am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '3d3e3bb445dbd1775cdcab0ac19563400ac2d60a':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount...
Leon Scroggins III [Wed, 27 May 2015 17:18:47 +0000 (17:18 +0000)]
am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs...
David Friedman [Wed, 27 May 2015 17:16:32 +0000 (17:16 +0000)]
Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs

9 years agoMerge "docs: Remove Google Play Services pages under Develop > Google Services. bug...
Quddus Chong [Wed, 27 May 2015 16:16:55 +0000 (16:16 +0000)]
Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467" into mnc-preview-docs

9 years agoam 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word...
Mike Colagrosso [Wed, 27 May 2015 15:53:03 +0000 (15:53 +0000)]
am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '31a48820aa858770cb1f1b3ce32a550565c83546':
  Android Training: Add missing word

9 years agoam 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:38:37 +0000 (15:38 +0000)]
am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '1c673f9abe8b6d931456ce6709c9b00cdb5d11ca':
  Android Training: Add missing word

9 years agoam 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:23:36 +0000 (15:23 +0000)]
am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '6eea30c422811da1b989500147afb82b5f2d45e0':
  Android Training: Add missing word

9 years agoam c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel...
Leon Scroggins III [Wed, 27 May 2015 15:22:45 +0000 (15:22 +0000)]
am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit 'c7a558fe73631e438061c31a54861594f0eb024f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained...
Leon Scroggins III [Wed, 27 May 2015 15:10:30 +0000 (15:10 +0000)]
am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '425d7c8713679ce9799139f7f91c6a45caa3b486':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:04:47 +0000 (15:04 +0000)]
Merge "Android Training: Add missing word" into lmp-docs

9 years agoam 11297581: am 18d79267: Check that the parcel contained the expected amount of...
Leon Scroggins III [Wed, 27 May 2015 14:53:00 +0000 (14:53 +0000)]
am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '11297581667128d2568a47ee03acab5c4f9f2784':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam b36ace74: Merge "Check that the parcel contained the expected amount of region...
Leon Scroggins III [Wed, 27 May 2015 14:39:21 +0000 (14:39 +0000)]
am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 18d79267: Check that the parcel contained the expected amount of region data....
Leon Scroggins III [Wed, 27 May 2015 14:37:18 +0000 (14:37 +0000)]
am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "Check that the parcel contained the expected amount of region data. DO NOT...
Leon Scroggins III [Wed, 27 May 2015 14:29:30 +0000 (14:29 +0000)]
Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

9 years agoDocs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
David Friedman [Tue, 26 May 2015 20:21:24 +0000 (13:21 -0700)]
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.

Change-Id: Ifeeb0f55ef849cf6fd262858fae1dc0f45e7aa52

9 years agoam 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdow...
Wale Ogunwale [Wed, 27 May 2015 06:06:51 +0000 (06:06 +0000)]
am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '5714170091065bb51f33c8f3ce272db07f69a21b':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunni...
Wale Ogunwale [Wed, 27 May 2015 05:52:33 +0000 (05:52 +0000)]
am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '0f7712407d96a847845b10eef34d9a259c687533':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesse...
Wale Ogunwale [Wed, 27 May 2015 05:35:52 +0000 (05:35 +0000)]
am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit 'bf0439a7e8824b4288f52c952a6808c8bdaf3235':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with...
Wale Ogunwale [Wed, 27 May 2015 05:17:55 +0000 (05:17 +0000)]
am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '02f3cf79989b202a45753ad74653d48f7d73c73d':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission...
Wale Ogunwale [Wed, 27 May 2015 05:03:29 +0000 (05:03 +0000)]
am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc...
Johan Euphrosine [Wed, 27 May 2015 04:57:05 +0000 (04:57 +0000)]
am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit 'a08a26c661d8cd31f3465ff8fa7356bcdad996a8':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Wale Ogunwale [Wed, 27 May 2015 04:50:11 +0000 (04:50 +0000)]
am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoMerge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs
Johan Euphrosine [Wed, 27 May 2015 04:43:21 +0000 (04:43 +0000)]
Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

9 years agoframeworks/base/docs/ndk: add files in reference_toc
Johan Euphrosine [Sat, 23 May 2015 01:14:51 +0000 (18:14 -0700)]
frameworks/base/docs/ndk: add files in reference_toc

Change-Id: Id5abb6e1eba9f5c829510e8c83dcc36f616cda6c

9 years agoam c2e34345: Doc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 04:05:42 +0000 (04:05 +0000)]
am c2e34345: Doc change: update gcm logo in card image.

* commit 'c2e343456e65fde54d1e9f54645030fe11fad585':
  Doc change: update gcm logo in card image.

9 years agoDoc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 03:51:04 +0000 (20:51 -0700)]
Doc change: update gcm logo in card image.

Change-Id: Id55a16aa0fdef874106e2a7ee75c472ad6cca3c6

9 years agoam ea1f6fb3: Doc change: edits and fixes to data binding guide.
Dirk Dougherty [Wed, 27 May 2015 03:45:29 +0000 (03:45 +0000)]
am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit 'ea1f6fb385d6f8d19ef18b196b9749dfc74e6cdc':
  Doc change: edits and fixes to data binding guide.

9 years agoDoc change: edits and fixes to data binding guide.
Dirk Dougherty [Wed, 27 May 2015 03:31:12 +0000 (20:31 -0700)]
Doc change: edits and fixes to data binding guide.

Change-Id: Iaef989bd48a99294e2032656653e71ef93313687

9 years agodocs: Fixing typo on Auto Backup for Apps page.
Andrew Solovay [Wed, 27 May 2015 02:05:29 +0000 (19:05 -0700)]
docs: Fixing typo on Auto Backup for Apps page.

See first comment for doc stage location.

bug: 21410471
Change-Id: I4e92a7d0e2056c02755d1d9ba403dbafcbe59490

9 years agoam f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android...
Joe Fernandez [Wed, 27 May 2015 01:28:01 +0000 (01:28 +0000)]
am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

* commit 'f47dc2cc0a73b32c71e8afdedb9b100a889b52f6':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC

9 years agoam 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new...
David Friedman [Wed, 27 May 2015 01:27:57 +0000 (01:27 +0000)]
am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

* commit '7311d2e267ab2444afe93f2c48742f858251ae2e':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

9 years agoam 493ff3cb: Doc change: move data binding library to tools tab.
Dirk Dougherty [Wed, 27 May 2015 01:27:52 +0000 (01:27 +0000)]
am 493ff3cb: Doc change: move data binding library to tools tab.

* commit '493ff3cb8f0c6f7729763f7d4a8571c0955d6f4b':
  Doc change: move data binding library to tools tab.

9 years agodocs: support library 22.2 duplicate link removal
Rich Slogar [Wed, 27 May 2015 00:30:15 +0000 (17:30 -0700)]
docs: support library 22.2 duplicate link removal

Change-Id: Ica9b7fc4ae3923658ec5ac2783f7697dae995b8d

9 years agoMerge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into...
Joe Fernandez [Wed, 27 May 2015 00:03:09 +0000 (00:03 +0000)]
Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

9 years agoMerge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into...
David Friedman [Tue, 26 May 2015 23:58:57 +0000 (23:58 +0000)]
Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

9 years agoDoc change: move data binding library to tools tab.
Dirk Dougherty [Tue, 26 May 2015 23:52:23 +0000 (16:52 -0700)]
Doc change: move data binding library to tools tab.

Change-Id: I74817864dc6fe390cb52ec2ea52ee1ea3a46c830

9 years agoDocs: "Tombstone" for old NDK page, directing visitors to new NDK site.
David Friedman [Sat, 23 May 2015 07:29:49 +0000 (00:29 -0700)]
Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

Change-Id: I520bfb5157b2ffed5baa182df7c6305bf8835360

9 years agoam c85bf859: Doc change: Updates to preview program overview and tags.
Dirk Dougherty [Tue, 26 May 2015 22:02:53 +0000 (22:02 +0000)]
am c85bf859: Doc change: Updates to preview program overview and tags.

* commit 'c85bf85941212bba8d6827397f9572ea9ec8e8ef':
  Doc change: Updates to preview program overview and tags.