OSDN Git Service
Selim Gurun [Tue, 23 Apr 2013 19:18:47 +0000 (12:18 -0700)]
am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
DO NOT MERGE Fix issues during backport
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
Dirk Dougherty [Mon, 22 Apr 2013 23:59:34 +0000 (16:59 -0700)]
am
00cfba95: Doc change: update support urls.
* commit '
00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
Doc 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
Dirk Dougherty [Mon, 22 Apr 2013 21:22:47 +0000 (14:22 -0700)]
am
974af93d: Doc change: update payment detail for merch account.
* commit '
974af93de950b68616aed44985720e2978db5393':
Doc 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
kmccormick [Mon, 22 Apr 2013 20:08:10 +0000 (20:08 +0000)]
Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
Scott Main [Mon, 22 Apr 2013 20:03:00 +0000 (13:03 -0700)]
fix backup registration url
external bug: 54539
Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
kmccormick [Mon, 22 Apr 2013 19:28:25 +0000 (12:28 -0700)]
Doc update: Fix firewall text.
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
Scott Main [Mon, 22 Apr 2013 19:12:10 +0000 (19:12 +0000)]
Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
Scott Main [Mon, 22 Apr 2013 19:11:18 +0000 (12:11 -0700)]
delete unused download page and add a couple search tags
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
Dirk Dougherty [Sat, 20 Apr 2013 19:01:29 +0000 (12:01 -0700)]
am
94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '
94ca86e8a019225ff376e5683e87ee3a29713f05':
Doc change: updates for tablet checklist.
Dirk Dougherty [Sat, 20 Apr 2013 18:59:02 +0000 (18:59 +0000)]
Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
Dirk Dougherty [Tue, 16 Apr 2013 18:55:12 +0000 (11:55 -0700)]
Doc change: updates for tablet checklist.
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
Selim Gurun [Sat, 20 Apr 2013 07:22:04 +0000 (00:22 -0700)]
am
758dfa0c: am
9d47e7b6: am
7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '
758dfa0c33c022ab3cdeb854ab507ad218d7fa3d':
DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Sat, 20 Apr 2013 07:22:01 +0000 (00:22 -0700)]
am
3c4fa654: am
679c8f68: am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
3c4fa654801fcf51a92cefd62e28a020d39e08d0':
Revert "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
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"
Geremy Condra [Sat, 20 Apr 2013 04:38:06 +0000 (21:38 -0700)]
am
b7787a31: DO NOT MERGE Merge commit \'
8225df00\' into bp
* commit '
b7787a317fc8bb163de04641a1423cd08324d4b8':
Add a delimiter between scheme and host
Scott Main [Fri, 19 Apr 2013 18:40:48 +0000 (11:40 -0700)]
add email links for android branding
bug:
8666523
Change-Id: Iee2fe78d7b9ab46723cc3407b9a8eede822b359c
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
Scott Main [Wed, 17 Apr 2013 04:05:51 +0000 (21:05 -0700)]
search suggest tags for google service docs
and exclude a whole bunch from suggestions
Change-Id: Id79653216fdcdd18e50d2463b0d27c1584848213
Dirk Dougherty [Tue, 16 Apr 2013 04:43:56 +0000 (21:43 -0700)]
am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
Doc 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
Dirk Dougherty [Mon, 15 Apr 2013 22:34:08 +0000 (15:34 -0700)]
am
99a79e80: Doc change: add policy guidelines documents.
* commit '
99a79e807b4bab154c9904a05d05dda4b420206a':
Doc change: add policy guidelines documents.
Scott Main [Mon, 15 Apr 2013 17:45:22 +0000 (17:45 +0000)]
Merge "add oppo and xiaomi driver links bug:
8523141" into jb-mr1.1-docs
Dirk Dougherty [Fri, 1 Feb 2013 22:45:32 +0000 (14:45 -0800)]
Doc change: add policy guidelines documents.
Change-Id: Iade088d20bc483fb65aabd85cb049b21188edf64
Scott Main [Fri, 12 Apr 2013 21:00:30 +0000 (14:00 -0700)]
moar doc tags for search suggestions (Design docs)
Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c
Scott Main [Fri, 12 Apr 2013 19:57:56 +0000 (19:57 +0000)]
Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
Scott Main [Fri, 12 Apr 2013 18:40:38 +0000 (11:40 -0700)]
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
Change-Id: Ideacad7f2b7dd78f56faef93de1f4d5bc60db6a7
Scott Main [Fri, 12 Apr 2013 18:19:39 +0000 (11:19 -0700)]
exclude IAB docs and various SDK docs from search suggestions
Also delete several useless files
Change-Id: I1b17e4eca17e69169002fc617180beb2ac83f67a
Scott Main [Fri, 12 Apr 2013 17:08:08 +0000 (17:08 +0000)]
Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
Scott Main [Fri, 12 Apr 2013 02:32:08 +0000 (19:32 -0700)]
doc tags for api guides
and delete a useless file
Change-Id: If6d2b77c9a2e6d473c4a473f7bd896aa35499938
Scott Main [Fri, 12 Apr 2013 02:14:13 +0000 (19:14 -0700)]
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
Change-Id: Ie8b9c48c9430e3aebaffbfb79f6774f6748db5d2
Scott Main [Wed, 10 Apr 2013 21:20:17 +0000 (14:20 -0700)]
add oppo and xiaomi driver links
bug:
8523141
Change-Id: I589cba4b0076733a8b77dbd64b511b81ab531fc8
Scott Main [Thu, 11 Apr 2013 02:31:56 +0000 (19:31 -0700)]
delete orphaned/redirected files
Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
Scott Main [Thu, 11 Apr 2013 01:59:29 +0000 (18:59 -0700)]
add meta tags to the rest of the training classes
Change-Id: I4db0acee547b198db754eaf0e78062614ac6f59a
Joe Fernandez [Wed, 10 Apr 2013 21:17:21 +0000 (21:17 +0000)]
Merge "docs: OpenGL Dev Guide, fix bug:
6104328" into jb-mr1.1-docs
Scott Main [Wed, 10 Apr 2013 16:51:41 +0000 (09:51 -0700)]
add a little more information to hierarchy view intro
Change-Id: I19f31a098d43e6bfcd575585732df5ec26f9bd2d
Scott Main [Tue, 9 Apr 2013 17:29:00 +0000 (10:29 -0700)]
fix xml error in sample
Change-Id: I59ca15028c52e0be081f4e65308f88e06115f7fd
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
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
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
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"
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
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
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
kmccormick [Thu, 4 Apr 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 01:16:15 +0000 (18:16 -0700)]
Doc update: clean up text and code snippets
"Bug:
6942838"
Change-Id: I496cbcd4b6236b5bc8a41484890f96721ba598a0
kmccormick [Thu, 4 Apr 2013 00:59:08 +0000 (00:59 +0000)]
Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:56:58 +0000 (17:56 -0700)]
Doc update: typo in widget design doc
"Bug:
7042997"
Change-Id: I89d60c42bb846514ad6792fb4a901698128a21b6
kmccormick [Thu, 4 Apr 2013 00:52:26 +0000 (00:52 +0000)]
Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:28:14 +0000 (17:28 -0700)]
Doc update: unterminated code tags
"Bug:
7250069"
Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
kmccormick [Thu, 4 Apr 2013 00:23:30 +0000 (00:23 +0000)]
Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
kmccormick [Thu, 4 Apr 2013 00:19:50 +0000 (17:19 -0700)]
Doc update: getString -> getInt
"Bug:
7426857"
Change-Id: I0535b38f57c21a1951f45f428ca327f2cbdcb50a
kmccormick [Wed, 3 Apr 2013 22:14:30 +0000 (22:14 +0000)]
Merge "Doc update: it's -> its" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 22:11:15 +0000 (15:11 -0700)]
Doc update: it's -> its
"Bug:
7738685"
Change-Id: I70b1354afeb5fc7a5801d3ad22866f21ae25c1ae
kmccormick [Wed, 3 Apr 2013 21:39:43 +0000 (21:39 +0000)]
Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:26:18 +0000 (14:26 -0700)]
Doc update: add links to maps docs
"Bug:
8090710"
Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4
kmccormick [Wed, 3 Apr 2013 21:16:08 +0000 (21:16 +0000)]
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 21:00:19 +0000 (14:00 -0700)]
Doc update: fix broken code sample
"Bug:
8537853"
Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
Joe Fernandez [Wed, 3 Apr 2013 20:52:55 +0000 (13:52 -0700)]
docs: OpenGL Dev Guide, fix bug:
6104328
Change-Id: I934bc2741586982f72238b7e11fb5accf38a97af
kmccormick [Wed, 3 Apr 2013 20:07:52 +0000 (20:07 +0000)]
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
kmccormick [Wed, 3 Apr 2013 19:41:12 +0000 (12:41 -0700)]
Doc update: clean up ubiquitous typo "the the"
"Bug:
8531405"
Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be
Scott Kennedy [Wed, 3 Apr 2013 16:20:38 +0000 (09:20 -0700)]
am
f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
* commit '
f7c06ddbfc79921d389ed6699df17e54c428571e':
docs: Typos and other fixes
Scott Kennedy [Wed, 3 Apr 2013 16:16:35 +0000 (16:16 +0000)]
Merge "docs: Typos and other fixes" into jb-mr1-dev
kmccormick [Tue, 2 Apr 2013 23:26:30 +0000 (23:26 +0000)]
Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
kmccormick [Tue, 2 Apr 2013 01:08:28 +0000 (18:08 -0700)]
Doc update: Misc doc bugs
"Bug:
6515524"
Change-Id: I1c8334e22637e9b55377a8743178bd5aa34ee9cd
Scott Main [Thu, 28 Feb 2013 01:51:49 +0000 (17:51 -0800)]
update dashboards for 4/1.
Now charts are generated from JSON data.
Change-Id: I17180b993a9ba50daf8a269ad26093079fd1da65
quddusc [Tue, 2 Apr 2013 16:56:04 +0000 (16:56 +0000)]
Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs:
8338447" into jb-mr1.1-docs
quddusc [Fri, 29 Mar 2013 22:32:38 +0000 (15:32 -0700)]
docs: Added details about key/signature for IAB/Licensing docs.
Bugs:
8338447
Change-Id: Ifc5556dc096065e59d34f6cde8fde2b64e5b200e
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
Scott Main [Mon, 1 Apr 2013 17:59:43 +0000 (10:59 -0700)]
update IO announcement on homepage for IO Extended
Change-Id: Id0e769162236954670dee07d6ac225a9d4b83581
kmccormick [Fri, 29 Mar 2013 23:06:58 +0000 (23:06 +0000)]
Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 23:00:50 +0000 (16:00 -0700)]
Doc update: clarify dumpsys instructions
"Bug:
8474578"
Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
kmccormick [Fri, 29 Mar 2013 22:53:03 +0000 (22:53 +0000)]
Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 22:48:45 +0000 (15:48 -0700)]
Doc update: PlaybackCompleted valid state 4 pause
"Bug:
7962402"
Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
kmccormick [Fri, 29 Mar 2013 22:44:48 +0000 (22:44 +0000)]
Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 22:21:12 +0000 (15:21 -0700)]
Doc update: clarify guidelines for firewall setup.
Change-Id: Id3284bb21a0a2b612babf6cf582fda8f1c73cb80
kmccormick [Fri, 29 Mar 2013 21:38:49 +0000 (21:38 +0000)]
Merge "Doc update: incorrect method name" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:31:54 +0000 (14:31 -0700)]
Doc update: incorrect method name
"Bug:
8177983"
Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
kmccormick [Fri, 29 Mar 2013 21:23:02 +0000 (21:23 +0000)]
Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:14:44 +0000 (14:14 -0700)]
Doc update: obsolete ant target.
"Bug:
8435577"
Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d
kmccormick [Fri, 29 Mar 2013 21:05:00 +0000 (21:05 +0000)]
Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:02:54 +0000 (14:02 -0700)]
Doc update: typos in code snippets.
"Bug:
8475026"
Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9
kmccormick [Fri, 29 Mar 2013 20:47:11 +0000 (20:47 +0000)]
Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 20:44:19 +0000 (13:44 -0700)]
Doc update: emulator bug fix
"Bug:
7990692"
Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1
kmccormick [Fri, 29 Mar 2013 01:00:10 +0000 (01:00 +0000)]
Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 00:47:52 +0000 (17:47 -0700)]
Doc update: clarify rules for rate param
"Bug:
5581113"
Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
kmccormick [Fri, 29 Mar 2013 00:16:21 +0000 (00:16 +0000)]
Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 00:01:21 +0000 (17:01 -0700)]
Doc update: fix broken XML causing prob in View
"Bug:
5873694"
Change-Id: I2b2a822538886825f8a863c741f2aebb665883f8
kmccormick [Thu, 28 Mar 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Doc update: misc fixes" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 23:33:11 +0000 (16:33 -0700)]
Doc update: misc fixes
"Bug:
3424410"
Some of these had already been fixed.
Change-Id: I1d0ab3a8fa51aa308186059db4186e7a7d24e9f8
kmccormick [Thu, 28 Mar 2013 23:13:32 +0000 (16:13 -0700)]
Doc update: fix incorrect enum
"Bug:
4980236"
Change-Id: I39f8f429574a9916c5fffc5b2e4ec4715ec48803
kmccormick [Thu, 28 Mar 2013 22:21:12 +0000 (22:21 +0000)]
Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 22:17:15 +0000 (15:17 -0700)]
Doc update: superceeded > superseded
"Bug:
5935672"
Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
kmccormick [Thu, 28 Mar 2013 01:48:42 +0000 (01:48 +0000)]
Merge "Doc update: typo" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:53:02 +0000 (01:53 +0000)]
Merge "Doc update: use parse, not new" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:49:36 +0000 (01:49 +0000)]
Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:47:58 +0000 (01:47 +0000)]
Merge "Doc Update: bug fix." into jb-mr1.1-docs
OSDN Git Service
