drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,547 Commits 1 Branch 0 Tags
Commit Graph

208547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
1cf99365cb Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a 
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
 2016-05-26 05:35:46 +00:00
Dirk Dougherty
a7c0788467 Merge "Remove spurious url reference." into mnc-mr-docs 
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
  Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
 2016-05-26 05:17:01 +00:00
Dirk Dougherty
1ed701493a Merge "Remove spurious url reference." into mnc-mr-docs 2016-05-26 05:03:25 +00:00
Chad Brubaker
11b56641e5 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
 2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
 2016-05-26 04:37:09 +00:00
Android Build Merger (Role)
ce99e3c571 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9 Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
  Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
 2016-05-26 04:26:11 +00:00
Chad Brubaker
c0f99aebdc Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 2016-05-26 04:09:40 +00:00
Dirk Dougherty
3930b5091e Remove spurious url reference. 
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
 2016-05-25 20:29:59 -07:00
Trevor Johns
46c1d5a5d2 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 
am: c8c2abed0e

* commit 'c8c2abed0e7418d7e0fb0ef73a0c363cec011b95':
  docs: Fix broken link in Volley training

Change-Id: I916717fca33fc1466cd1c022c6a4f5f931d00ebe
 2016-05-26 01:59:17 +00:00
Joe Fernandez
e8a0b488dc docs: Remove Advertising ID page and redirect to GMS reference docs 
b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
 2016-05-25 18:36:12 -07:00
Trevor Johns
c8c2abed0e docs: Fix broken link in Volley training am: 05dd9d2c29 
am: 346114e346

* commit '346114e3467cc06b2a90467a00288f6944dd969b':
  docs: Fix broken link in Volley training

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
 2016-05-26 01:32:43 +00:00
Trevor Johns
346114e346 docs: Fix broken link in Volley training 
am: 05dd9d2c29

* commit '05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
  docs: Fix broken link in Volley training

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
 2016-05-26 01:18:44 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training 
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
 2016-05-25 16:13:21 -07:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
 2016-05-25 21:35:54 +00:00
Eric Schmidt
3c2709c6b7 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 
am: 5548a7c59c

* commit '5548a7c59cf6a41095c72189fee7e522b5cab8f1':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
 2016-05-25 21:35:43 +00:00
Android Build Merger (Role)
cb3ae33cfe Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 2016-05-25 21:28:20 +00:00
Amanda Kassay
4be59f0ae3 Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
am: c68d8768c8

* commit 'c68d8768c84dd045d3db3f685a95963eb315be8c':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I40fa99170770712c4d844eab0d1e3d6fa9373d90
 2016-05-25 21:28:01 +00:00
Eric Schmidt
5548a7c59c Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 2016-05-25 21:27:35 +00:00
Amanda Kassay
c68d8768c8 Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
This reverts commit 85b7df26975997826a738a46ae4ab797941175ea.

Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
 2016-05-25 17:14:08 -04:00
Alex Klyubin
d1df52a46b Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 
am: 56f32483b0

* commit '56f32483b04723bf750e51badcfec3203c352d32':
  Fix incorrect cleartext attribute

Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
 2016-05-25 18:24:31 +00:00
Chad Brubaker
56f32483b0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 
am: f2e0a719d0

* commit 'f2e0a719d00c4a7c6865f6784efc9b3f88421136':
  Fix incorrect cleartext attribute

Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
 2016-05-25 18:16:03 +00:00
Alex Klyubin
f2e0a719d0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 2016-05-25 18:04:54 +00:00
Eric Schmidt
22f5dd2372 docs: Instant Apps broken link, wonky video thumbnail 
Bug: 28861513
Bug: 28842359
Change-Id: I8c90d3131f614727a96937702f062a95f998047a
 2016-05-24 16:56:45 -07:00
Amanda Kassay
5a00e9d345 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 
am: e468c2380d

* commit 'e468c2380ddcc1a7c1f2fa3c9995ad999e9c0ca8':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibb8848aed348e85fff5a47562212e88172557b0b
 2016-05-24 21:23:50 +00:00
Amanda Kassay
e468c2380d Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
am: 85b7df2697

* commit '85b7df26975997826a738a46ae4ab797941175ea':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: If25728a85efb5b0ed46e87c45916621d8ad1d9ab
 2016-05-24 21:12:15 +00:00
Amanda Kassay
85b7df2697 Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
b/28917925

Related CL (critique): cl/123138252

Staged:
https://android-dot-devsite.googleplex.com/preview/setup-sdk.html?hl=es

Change-Id: I4eb606c0205af2315896fc0587cc1c4c2502f282
 2016-05-24 20:25:47 +00:00
Adarsh Fernando
734e7725ac Doc: delete old test_framework.png 
am: 05c98d5458

* commit '05c98d54583b84160ab8d7957989c8448fc06301':
  Doc: delete old test_framework.png

Change-Id: I54e69e3123b993e9e6e6b9a8a0c1a2e89011ed76
 2016-05-24 19:20:55 +00:00
Adarsh Fernando
9b81008076 Docs: Changed URL references of relocated test_framework.png 
am: b4c6f2b637

* commit 'b4c6f2b63713c958e46b02b6c520271ec77fdda2':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ief551478b2fa023cdea013c766017e3bc0eba79e
 2016-05-24 18:11:43 +00:00
Adarsh Fernando
05c98d5458 Doc: delete old test_framework.png 
- file now relocated to /studio/images/test/test-framework.png

Change-Id: Ieb2d93472e29741be73f104bf319911b09accf6f
 2016-05-24 10:58:43 -07:00
Adarsh Fernando
b4c6f2b637 Docs: Changed URL references of relocated test_framework.png 
Change-Id: I45458480fd07fc9da7ad74a6fc04b5ccebd8d463
 2016-05-24 09:42:41 -07:00
Chad Brubaker
80fd4e1292 Fix incorrect cleartext attribute 
Bug: 28914756
Change-Id: Icb3b34b8b088eb8c03eb0b7049670df6d65973f9
 2016-05-23 15:30:52 -07:00
Chad Brubaker
ef88f26b03 Track changes to network security config manifest configuration 
Bug: 28908502
Bug: 28763009
Change-Id: If104c2344287ac3e19c34ff0e7cbff0cd6e95c98
 2016-05-23 13:09:54 -07:00
Hemal Patel
7f21500b1c Merge "Docs: Fixed a typo" into mnc-io-docs 
am: 31707f0185

* commit '31707f01851ab18ab7b60d8cd8a825b07e83e840':
  Docs: Fixed a typo

Change-Id: Icdd5d354cedea96a70d74c0e63604e1c69eae370
 2016-05-21 00:58:14 +00:00
Hemal Patel
31707f0185 Merge "Docs: Fixed a typo" into mnc-io-docs 2016-05-21 00:49:47 +00:00
Hemal Patel
a18a3d3211 Merge "Docs: Fixed a wrong file name" into mnc-io-docs 
am: 06a9fbcdd6

* commit '06a9fbcdd68a3d48697e6e88c04fcdb6040673c5':
  Docs: Fixed a wrong file name

Change-Id: I7f672848dfc1f77a2559494c34de6d5cc70df130
 2016-05-20 00:19:35 +00:00
Hemal Patel
06a9fbcdd6 Merge "Docs: Fixed a wrong file name" into mnc-io-docs 2016-05-20 00:15:09 +00:00
Cheryl Potter
0793d19267 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 
am: f2fa5cd702

* commit 'f2fa5cd7022d450d4e0faa4c81db5207d1ec00d3':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Iacbf1fca2c1d3189a39122e893ece5fcf033246a
 2016-05-20 00:11:13 +00:00
Cheryl Potter
f2fa5cd702 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 
am: d382293118

* commit 'd382293118dad1337726986c1f2465d2ec25171b':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Ieadb04df863e4f50db2b1b6168cc31f6501fa242
 2016-05-20 00:08:47 +00:00
Scott Main
ccf143ea10 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 
am: 9ad92619dc

* commit '9ad92619dc455a42c40e5b102e2fdf65c2787549':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b
 2016-05-20 00:08:46 +00:00
smain@google.com
9ad92619dc Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs 
am: 486f792d44

* commit '486f792d4448819c47c7e18dfd4ccb40133df528':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d
 2016-05-20 00:05:01 +00:00
Cheryl Potter
d382293118 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 2016-05-20 00:03:07 +00:00
Cheryl Potter
72686af4f6 docs: Fix card descriptions in Android Monitor Overview page 
b/2885829

Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
 2016-05-19 16:55:49 -07:00
Scott Main
486f792d44 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs 2016-05-19 23:54:20 +00:00
smain@google.com
f7304c8cc8 update links to studio docs 
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
 2016-05-19 23:43:17 +00:00
smain@google.com
73cf8224cb update links to studio docs 
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
 2016-05-19 16:30:43 -07:00
Dirk Dougherty
8053c79246 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 
am: 5fb577e6bc

* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
  Remove outdated google services links.

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
 2016-05-19 23:13:57 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs 
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
 2016-05-19 23:07:10 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00