OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 21:59:40 +0000 (14:59 -0700)]
am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore

* commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
  Ensure install-during-restore is like install-then-restore

11 years agoam 81c1d8d3: Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 21:53:10 +0000 (14:53 -0700)]
am 81c1d8d3: Ensure install-during-restore is like install-then-restore

* commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
  Ensure install-during-restore is like install-then-restore

11 years agoEnsure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 20:07:05 +0000 (13:07 -0700)]
Ensure install-during-restore is like install-then-restore

When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e

11 years agoam f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:41:36 +0000 (15:41 -0700)]
am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls

* commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
  libdrm: fix bad strncpy / snprintf calls

11 years agoam 6d8f5b75: libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:38:40 +0000 (15:38 -0700)]
am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls

* commit '6d8f5b755b133b308204b84145d773d401cdcd52':
  libdrm: fix bad strncpy / snprintf calls

11 years agolibdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 17:49:47 +0000 (10:49 -0700)]
libdrm: fix bad strncpy / snprintf calls

Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2

11 years agoDoc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:33:46 +0000 (19:33 -0700)]
Doc change: fix typo in tablet guidelines.

Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41

11 years agoMerge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
Dirk Dougherty [Wed, 24 Apr 2013 19:08:42 +0000 (19:08 +0000)]
Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev

11 years agoDoc change: Add tablet optimization tips info/link.
Dirk Dougherty [Mon, 22 Apr 2013 19:12:44 +0000 (12:12 -0700)]
Doc change: Add tablet optimization tips info/link.

Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6

11 years agoMerge commit '8237dd82' into manualmerge
Selim Gurun [Tue, 23 Apr 2013 18:08:37 +0000 (11:08 -0700)]
Merge commit '8237dd82' into manualmerge

Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f

11 years agoDoc change: update support urls.
Dirk Dougherty [Mon, 22 Apr 2013 21:45:30 +0000 (14:45 -0700)]
Doc change: update support urls.

Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f

11 years agoDoc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 20:03:11 +0000 (13:03 -0700)]
Doc change: update payment detail for merch account.

Change-Id: I54298c010183a112776065ec894611d5de5f1cc1

11 years agoMerge "Doc change: updates for tablet checklist." into jb-mr1-dev
Dirk Dougherty [Sat, 20 Apr 2013 18:59:02 +0000 (18:59 +0000)]
Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

11 years agoDoc change: updates for tablet checklist.
Dirk Dougherty [Tue, 16 Apr 2013 18:55:12 +0000 (11:55 -0700)]
Doc change: updates for tablet checklist.

Change-Id: I0339c0d3853467da435654940d0c55a31139b736

11 years agoam 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Sat, 20 Apr 2013 07:19:45 +0000 (00:19 -0700)]
am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:19:41 +0000 (00:19 -0700)]
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"

11 years agoDO NOT MERGE Merge commit '8225df00' into bp
Geremy Condra [Thu, 18 Apr 2013 18:40:09 +0000 (11:40 -0700)]
DO NOT MERGE Merge commit '8225df00' into bp

Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47

11 years agoDoc change: Add tablet basic checks.
Dirk Dougherty [Mon, 1 Apr 2013 19:10:14 +0000 (12:10 -0700)]
Doc change: Add tablet basic checks.

Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d

11 years agoDoc change: add policy guidelines documents.
Dirk Dougherty [Fri, 1 Feb 2013 22:45:32 +0000 (14:45 -0800)]
Doc change: add policy guidelines documents.

Change-Id: Iade088d20bc483fb65aabd85cb049b21188edf64

11 years agoam 93c39d5d: DO NOT MERGE Fix issues during backport
Selim Gurun [Fri, 5 Apr 2013 19:05:52 +0000 (12:05 -0700)]
am 93c39d5d: DO NOT MERGE Fix issues during backport

* commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af':
  DO NOT MERGE Fix issues during backport

11 years agoDO NOT MERGE Fix issues during backport
Selim Gurun [Thu, 4 Apr 2013 23:20:29 +0000 (16:20 -0700)]
DO NOT MERGE Fix issues during backport

Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038

11 years agoam 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Thu, 4 Apr 2013 18:08:35 +0000 (11:08 -0700)]
am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 38915fd4: Revert "Add a delimiter between scheme and host"
Selim Gurun [Thu, 4 Apr 2013 18:00:46 +0000 (11:00 -0700)]
am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '38915fd4d466cc233189bf5b5c11d7f03a416d35':
  Revert "Add a delimiter between scheme and host"

11 years agoDO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Fri, 8 Mar 2013 22:23:00 +0000 (14:23 -0800)]
DO NOT MERGE Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f

11 years agoRevert "Add a delimiter between scheme and host"
Selim Gurun [Thu, 4 Apr 2013 17:14:29 +0000 (17:14 +0000)]
Revert "Add a delimiter between scheme and host"

This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e

11 years agoam aa2163dd: Add a delimiter between scheme and host
Selim Gurun [Thu, 4 Apr 2013 04:05:40 +0000 (21:05 -0700)]
am aa2163dd: Add a delimiter between scheme and host

* commit 'aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
  Add a delimiter between scheme and host

11 years agoMerge "docs: Typos and other fixes" into jb-mr1-dev
Scott Kennedy [Wed, 3 Apr 2013 16:16:35 +0000 (16:16 +0000)]
Merge "docs: Typos and other fixes" into jb-mr1-dev

11 years agoAdd a delimiter between scheme and host
Selim Gurun [Fri, 8 Mar 2013 22:23:00 +0000 (14:23 -0800)]
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6

11 years agoMerge "Android Training: Accessing Contacts" into jb-mr1-dev
Joe Malin [Tue, 26 Mar 2013 16:31:21 +0000 (16:31 +0000)]
Merge "Android Training: Accessing Contacts" into jb-mr1-dev

11 years agoam 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 21:08:37 +0000 (14:08 -0700)]
am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain

* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
  Validate restored file paths against their nominal domain

11 years agoam 0cb27e28: Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 21:05:47 +0000 (14:05 -0700)]
am 0cb27e28: Validate restored file paths against their nominal domain

* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
  Validate restored file paths against their nominal domain

11 years agoValidate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 17:06:34 +0000 (10:06 -0700)]
Validate restored file paths against their nominal domain

Bug 8460775

(cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9

11 years agoAndroid Training: Accessing Contacts
Joe Malin [Tue, 15 Jan 2013 23:06:08 +0000 (15:06 -0800)]
Android Training: Accessing Contacts

Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6

11 years ago[docs] Fix issue #8288695: Typo in OAuth2 training
Trevor Johns [Wed, 6 Mar 2013 22:46:47 +0000 (14:46 -0800)]
[docs] Fix issue #8288695: Typo in OAuth2 training

There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f

11 years agodocs: update country filtering description
Scott Main [Wed, 27 Feb 2013 20:23:49 +0000 (12:23 -0800)]
docs: update country filtering description
bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78

11 years agoMerge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard...
Scott Main [Tue, 5 Mar 2013 19:39:37 +0000 (19:39 +0000)]
Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev

11 years agoMerge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
Joe Malin [Tue, 5 Mar 2013 19:35:56 +0000 (19:35 +0000)]
Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev

11 years agocherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
Scott Main [Tue, 5 Mar 2013 00:18:27 +0000 (16:18 -0800)]
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763

11 years agoMerge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into...
Adam Koch [Tue, 5 Mar 2013 14:25:50 +0000 (14:25 +0000)]
Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev

11 years agoam bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:23:40 +0000 (17:23 -0800)]
am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.

* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.

11 years agoam a2e929e1: Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:20:51 +0000 (17:20 -0800)]
am a2e929e1: Tighten enforcement of file modes.

* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.

11 years agoTighten enforcement of file modes.
Jeff Sharkey [Thu, 28 Feb 2013 23:57:36 +0000 (15:57 -0800)]
Tighten enforcement of file modes.

Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792

11 years agodocs: add bdc's security doc as training article
Scott Main [Fri, 18 Jan 2013 00:58:50 +0000 (16:58 -0800)]
docs: add bdc's security doc as training article

Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46

11 years agoBug 8289268: Reversed text Content Provider Basics
Joe Malin [Thu, 28 Feb 2013 17:18:24 +0000 (09:18 -0800)]
Bug 8289268: Reversed text Content Provider Basics

Change-Id: I4eab50651d47bb86709740595d982d9524a561fb

11 years agoMerge "Doc change: update 'multiple apks' criteria in filters doc." into jb-mr1-dev
Dirk Dougherty [Thu, 28 Feb 2013 02:51:15 +0000 (02:51 +0000)]
Merge "Doc change: update 'multiple apks' criteria in filters doc." into jb-mr1-dev

11 years agoDoc change: update 'multiple apks' criteria in filters doc.
Dirk Dougherty [Wed, 27 Feb 2013 23:53:37 +0000 (15:53 -0800)]
Doc change: update 'multiple apks' criteria in filters doc.

Change-Id: I8504f5e019758946d567d4391c1a875dead236c5
Bug: 8277558

11 years agoMerge "docs: add MTK usb driver info" into jb-mr1-dev
Scott Main [Thu, 28 Feb 2013 01:22:57 +0000 (01:22 +0000)]
Merge "docs: add MTK usb driver info" into jb-mr1-dev

11 years agoDoc change: Mention ratings in app stats intro, mention proguard in pub checklist...
Dirk Dougherty [Wed, 27 Feb 2013 22:11:52 +0000 (14:11 -0800)]
Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.

Change-Id: I9bba5b8ffb7da40083904f6f471e99fd4c98d63d
Bug: 8033688
Bug: 8277558

11 years agodocs: another string change for developer console
Scott Main [Wed, 27 Feb 2013 18:08:27 +0000 (10:08 -0800)]
docs: another string change for developer console
bug: 8033647

Change-Id: Ia6b476e22f2e370eeefd0556e2c9d0b4295482a9

11 years agodocs: followup to I32f25b692872ed7827e611890c563498993b2480
Scott Main [Tue, 26 Feb 2013 22:27:20 +0000 (14:27 -0800)]
docs: followup to I32f25b692872ed7827e611890c563498993b2480

Change-Id: I7942e243e77cbe9ea9a7cd542b4255f9ca273a4d

11 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:03:20 +0000 (14:03 -0800)]
Reconcile with jb-mr1-release - do not merge

11 years agoMerge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev
Dirk Dougherty [Tue, 26 Feb 2013 18:36:11 +0000 (18:36 +0000)]
Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev

11 years agodocs: add MTK usb driver info
Scott Main [Tue, 26 Feb 2013 17:45:13 +0000 (09:45 -0800)]
docs: add MTK usb driver info

Change-Id: I847877e65207d065883e7ab74be65b6333ca205d

11 years agodocs: remove games references
Robert Ly [Tue, 26 Feb 2013 15:49:56 +0000 (07:49 -0800)]
docs: remove games references

Change-Id: I32f25b692872ed7827e611890c563498993b2480

11 years agoMerge "docs: gms cheddar updates for g+" into jb-mr1-dev
Robert Ly [Tue, 26 Feb 2013 05:59:49 +0000 (05:59 +0000)]
Merge "docs: gms cheddar updates for g+" into jb-mr1-dev

11 years agodocs: gms cheddar updates for g+
Robert Ly [Tue, 12 Feb 2013 18:31:42 +0000 (10:31 -0800)]
docs: gms cheddar updates for g+

Change-Id: I7ffd94fa17f0911f83e0c40462861a9e6080a197

11 years agodocs: gms and gcm javadocs
Robert Ly [Mon, 25 Feb 2013 22:43:01 +0000 (14:43 -0800)]
docs: gms and gcm javadocs

Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f

11 years agoMerge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
Joe Malin [Mon, 25 Feb 2013 19:29:06 +0000 (19:29 +0000)]
Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev

11 years agodocs: add google io registration announcement to home page
Scott Main [Mon, 25 Feb 2013 18:19:11 +0000 (10:19 -0800)]
docs: add google io registration announcement to home page

Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42

11 years agoBug 8261430: Typo in Notifications
Joe Malin [Mon, 25 Feb 2013 18:20:29 +0000 (10:20 -0800)]
Bug 8261430: Typo in Notifications

Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810

11 years agoMerge "fix javadocs" into jb-mr1-dev
Dirk Dougherty [Fri, 22 Feb 2013 21:35:11 +0000 (21:35 +0000)]
Merge "fix javadocs" into jb-mr1-dev

11 years agofix javadocs
Robert Ly [Fri, 22 Feb 2013 21:32:21 +0000 (13:32 -0800)]
fix javadocs

Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687

11 years agoMerge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
Adam Koch [Fri, 22 Feb 2013 19:58:32 +0000 (19:58 +0000)]
Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev

11 years agoDisplaying Bitmaps Efficiently Training - Update sample app zip
Adam Koch [Fri, 22 Feb 2013 18:02:24 +0000 (13:02 -0500)]
Displaying Bitmaps Efficiently Training - Update sample app zip

Change-Id: I97faf4bcf5c46083fdbe2bb094be9a3bcfff0bd8

11 years agoDoc change: Update DC image, fix typo.
Dirk Dougherty [Fri, 22 Feb 2013 17:54:45 +0000 (09:54 -0800)]
Doc change: Update DC image, fix typo.

Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d

11 years agoDoc fix: update BitmapFactory.Options.inSampleSize javadoc
Adam Koch [Fri, 22 Feb 2013 16:45:17 +0000 (11:45 -0500)]
Doc fix: update BitmapFactory.Options.inSampleSize javadoc
Bug: 8250653

Change-Id: I7187372ab3c742b9395d119a7425f60f071dbb4e

11 years agoDoc change: Remove refs to Copy Protection and note EOL in GP.
Dirk Dougherty [Wed, 5 Sep 2012 01:09:08 +0000 (18:09 -0700)]
Doc change: Remove refs to Copy Protection and note EOL in GP.

Change-Id: Ia03a6173cc635a5de460cd5534c454840510b33d

Bug:6951537

11 years agoDoc Change. Update docs to remove "Preview" from dev console, update screenshots...
Dirk Dougherty [Mon, 28 Jan 2013 18:19:06 +0000 (10:19 -0800)]
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

bug: 8033647
bug: 8033688

Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691

11 years agodocs: add note about javascript interface to 4.2 overview
Scott Main [Wed, 20 Feb 2013 23:32:30 +0000 (15:32 -0800)]
docs: add note about javascript interface to 4.2 overview

Change-Id: I19454c481061b27197399d63abc466810b9e1ff8

11 years agoupdate dev console language for new site design.
Scott Main [Thu, 31 Jan 2013 00:20:49 +0000 (16:20 -0800)]
update dev console language for new site design.
Language only; no screenshot changes.
bug: 8032875
bug: 8033647
bug: 8033688

Change-Id: Ia333846e89d025b1edc919a40cb2224b04deb9ab

11 years agodocs: sanitize input for badge generator
Scott Main [Tue, 19 Feb 2013 19:51:37 +0000 (11:51 -0800)]
docs: sanitize input for badge generator
bug: 8002240

Change-Id: Ic1429284fd1953fb6819110ecb47fcb3a79a9600

11 years agoDoc change: Edits for RTL in highlights.
Dirk Dougherty [Tue, 13 Nov 2012 22:36:56 +0000 (14:36 -0800)]
Doc change: Edits for RTL in highlights.

Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a

11 years agoDoc change: add notice for iab v3 subscriptions launch.
Dirk Dougherty [Thu, 14 Feb 2013 19:47:36 +0000 (11:47 -0800)]
Doc change: add notice for iab v3 subscriptions launch.

Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c

11 years agoMerge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb...
quddusc [Thu, 14 Feb 2013 01:09:27 +0000 (01:09 +0000)]
Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev

11 years agodocs: Updated In-app Billing docs to support subscriptions for V3.
quddusc [Fri, 8 Feb 2013 01:16:33 +0000 (17:16 -0800)]
docs: Updated In-app Billing docs to support subscriptions for V3.

Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29

11 years agoMerge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 23:23:20 +0000 (23:23 +0000)]
Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev

11 years agodocs: fix tools sidenav for offline docs
Scott Main [Wed, 13 Feb 2013 23:06:41 +0000 (15:06 -0800)]
docs: fix tools sidenav for offline docs

Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f

11 years agodocs: SDK r21.1 - fix download links, Issue 8193979
Joe Fernandez [Wed, 13 Feb 2013 22:51:59 +0000 (14:51 -0800)]
docs: SDK r21.1 - fix download links, Issue 8193979

Change-Id: Iabbbb030d50390021feab478812140158cdfd104

11 years agoMerge "docs: add info about secure adb" into jb-mr1-dev
Scott Main [Wed, 13 Feb 2013 18:01:32 +0000 (18:01 +0000)]
Merge "docs: add info about secure adb" into jb-mr1-dev

11 years agoMerge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 17:35:22 +0000 (17:35 +0000)]
Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev

11 years agodocs: Keystore/Cert warning for Signing Apps, Issue: 8180111
Joe Fernandez [Wed, 13 Feb 2013 00:55:43 +0000 (16:55 -0800)]
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111

Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2

11 years agoMerge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 15:10:15 +0000 (15:10 +0000)]
Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev

11 years agoMerge "lists.js files for gms and gcm" into jb-mr1-dev
Scott Main [Wed, 13 Feb 2013 02:24:28 +0000 (02:24 +0000)]
Merge "lists.js files for gms and gcm" into jb-mr1-dev

11 years agolists.js files for gms and gcm
Robert Ly [Wed, 13 Feb 2013 01:52:19 +0000 (17:52 -0800)]
lists.js files for gms and gcm

Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159

11 years agodocs: add info about secure adb
Scott Main [Tue, 5 Feb 2013 22:05:36 +0000 (14:05 -0800)]
docs: add info about secure adb

Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa

11 years agoMerge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
Robert Ly [Tue, 12 Feb 2013 21:46:06 +0000 (21:46 +0000)]
Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev

11 years agoRevert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:39:28 +0000 (21:39 +0000)]
Revert "makefile changes for gcm javadocs"

This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f

11 years agoMerge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
Robert Ly [Tue, 12 Feb 2013 18:37:51 +0000 (18:37 +0000)]
Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev

11 years agoRevert "makefile changes for s.a.c"
Robert Ly [Tue, 12 Feb 2013 18:29:10 +0000 (18:29 +0000)]
Revert "makefile changes for s.a.c"

This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc

11 years agodocs: nudge dashboard chart to the right to avoid overlap
Scott Main [Mon, 11 Feb 2013 22:24:03 +0000 (14:24 -0800)]
docs: nudge dashboard chart to the right to avoid overlap

Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a

11 years agomakefile changes for s.a.c
Robert Ly [Fri, 8 Feb 2013 22:37:13 +0000 (14:37 -0800)]
makefile changes for s.a.c

Change-Id: I501cc140994b2822c3df1f00639076f17765f256

11 years agoDoc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:18:59 +0000 (11:18 -0800)]
Doc change: fix typos.

Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc

11 years agodocs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Mon, 4 Feb 2013 19:16:12 +0000 (11:16 -0800)]
docs: Android SDK 21.1.0 Release Notes

Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b

11 years agoMerge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content...
Dirk Dougherty [Fri, 8 Feb 2013 19:09:53 +0000 (19:09 +0000)]
Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev

11 years agoMerge "makefile changes for gcm javadocs" into jb-mr1-dev
Robert Ly [Fri, 8 Feb 2013 01:48:14 +0000 (01:48 +0000)]
Merge "makefile changes for gcm javadocs" into jb-mr1-dev

11 years agoDoc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 01:32:35 +0000 (17:32 -0800)]
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.

Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315

11 years agoMerge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
Katie McCormick [Fri, 8 Feb 2013 01:14:47 +0000 (01:14 +0000)]
Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev

11 years agoDoc change: Scroller Javadoc Bug # 7966653
Katie McCormick [Thu, 7 Feb 2013 02:15:13 +0000 (18:15 -0800)]
Doc change: Scroller Javadoc Bug # 7966653

Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9

11 years agoDoc update: clean up
Katie McCormick [Thu, 7 Feb 2013 22:23:14 +0000 (14:23 -0800)]
Doc update: clean up

Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682

11 years agomakefile changes for gcm javadocs
Robert Ly [Wed, 5 Dec 2012 01:01:46 +0000 (17:01 -0800)]
makefile changes for gcm javadocs

Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2