summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Doc update: CCS and notifications" into jb-mr1.1-docskmccormick2013-05-148-240/+1042
|\ \ \ \ | |_|/ / |/| | |
| * | | Doc update: CCS and notificationskmccormick2013-05-138-240/+1042
| | |/ | |/| | | | | | | Change-Id: I607441a39b420ef1ebcaeb676a4f97dcd7286fe3
* | | Merge "Doc change: Add localization checklist." into jb-mr1.1-docsDirk Dougherty2013-05-1410-170/+740
|\ \ \
| * | | Doc change: Add localization checklist.Dirk Dougherty2013-05-1410-170/+740
| | | | | | | | | | | | | | | | Change-Id: Ib5dbb72d99bb36a01e93256a8c4569cfba113651
* | | | Merge "Doc change: Clean refresh of gms reference to remove unused." into ↵Dirk Dougherty2013-05-148-12077/+0
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1.1-docs
| * | | | Doc change: Clean refresh of gms reference to remove unused.Dirk Dougherty2013-05-148-12077/+0
| |/ / / | | | | | | | | | | | | Change-Id: Iaa64d6855397a1290153cac48c5f7d1465332f96
* | | | Doc change: a new image for play services location landing.Dirk Dougherty2013-05-131-0/+0
|/ / / | | | | | | | | | Change-Id: If66a0272fedebbc0191e966938d2cc50e4758bb6
* | | Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docsJoe Malin2013-05-1417-512/+3650
|\ \ \ | |_|/ |/| |
| * | Android U: Making Apps Location-AwareJoe Malin2013-05-1317-512/+3650
| |/ | | | | | | Change-Id: I8f44c6ca6d797ceb8ada5b2c723a8cca0081cf0a
* | Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docsDirk Dougherty2013-05-133-17/+37
|\ \
| * | Doc change: Updates to gpgs landing.Dirk Dougherty2013-05-133-17/+37
| |/ | | | | | | Change-Id: Iec8aea322ec7ad7fde176171ed8a63fdbff4744b
* | Doc change: update gps 3.1 reference docs.Dirk Dougherty2013-05-115-184/+173
|/ | | | | Bug: 8918191 Change-Id: I3b74aad404eee7420673e04d13a2eb31b60ec833
* Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docsDirk Dougherty2013-05-10219-7391/+127710
|\
| * Doc change: refresh gms/gcm reference docs.Dirk Dougherty2013-05-09219-7391/+127710
| | | | | | | | Change-Id: Ife17b6b3dfb387bc7de6c827c0e6db19a756534f
* | Merge "update homepage with IO Live banner" into jb-mr1.1-docsScott Main2013-05-092-9/+8
|\ \
| * | update homepage with IO Live bannerScott Main2013-05-072-9/+8
| | | | | | | | | | | | Change-Id: Ifd333287a04c426df4db2c00a1f19560c304b839
* | | Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docsScott Main2013-05-088-134/+6
|\ \ \ | |/ / |/| |
| * | delete obsolete tips/references to cupcakeScott Main2013-05-068-134/+6
| | | | | | | | | | | | Change-Id: Ib1ddb19c42840aa830acd85a89e78c149e2f66e9
* | | some more search tagsScott Main2013-05-072-2/+2
| | | | | | | | | | | | Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
* | | Doc change: delete legacy intl dir and update toc's for devsite-compatible ↵Dirk Dougherty2013-05-0662-8674/+14
| |/ |/| | | | | | | | | lang strings. Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490
* | delete a few unused/obsolete files and add redirectsScott Main2013-05-067-662/+8
|/ | | | Change-Id: Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
|\ | | | | | | | | | | | | install-then-restore * commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae': Ensure install-during-restore is like install-then-restore
| * am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
| |\ | | | | | | | | | | | | | | | | | | install-then-restore * commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4': Ensure install-during-restore is like install-then-restore
| | * am 81c1d8d3: Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | |\ | | | | | | | | | | | | | | | | * commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df': Ensure install-during-restore is like install-then-restore
| | | * Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Doc change: Update landing pages for Google Play Services.Dirk Dougherty2013-05-035-9/+171
| | | | | | | | | | | | | | | | Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
* | | | Merge "docs: Added landing page for Google Play Games Platform Services. ↵quddusc2013-05-033-0/+73
|\ \ \ \ | | | | | | | | | | | | | | | cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs
| * | | | docs: Added landing page for Google Play Games Platform Services.quddusc2013-05-013-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71 Change-Id: I0e5e2c69fc0d13b0637504e5fd3e76c1a91a0109
* | | | | dashboard update for 5/1Scott Main2013-05-011-25/+26
|/ / / / | | | | | | | | | | | | Change-Id: I9cdcf2934a5332fee50067e0b6f8f3f159373892
* | | | Contacts Provider Training - fix minor code snippet typos.Adam Koch2013-05-011-3/+3
| | | | | | | | | | | | | | | | Change-Id: I3edf86d276d877914a3d97e596e1bb35d1b1ce1f
* | | | am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd440ca76029ab6f0909fdd9495941e04b90e5da7': libdrm: fix bad strncpy / snprintf calls
| * | | am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52': libdrm: fix bad strncpy / snprintf calls
| | * | am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '6d8f5b755b133b308204b84145d773d401cdcd52': libdrm: fix bad strncpy / snprintf calls
| | | * libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 29743661: Doc change: fix typo in tablet guidelines.Dirk Dougherty2013-04-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '29743661734d8e2b7b3c33e635557c3f2ef9d8a0': Doc change: fix typo in tablet guidelines.
| * | | Doc change: fix typo in tablet guidelines.Dirk Dougherty2013-04-241-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41
* | | | Doc Update: bug fix in SensorEvent refkmccormick2013-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | "Bug: 6349093" Change-Id: Ibd4911b6c3f17fd2cd18042665efa428231c61ab
* | | | am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." ↵Dirk Dougherty2013-04-241-60/+153
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'dacaad4ab21bfe8d6de74d60d2ce881d2a276a9d': Doc change: Add tablet optimization tips info/link.
| * | | Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-devDirk Dougherty2013-04-241-60/+153
| |\ \ \
| | * | | Doc change: Add tablet optimization tips info/link.Dirk Dougherty2013-04-241-60/+153
| | | | | | | | | | | | | | | | | | | | Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
* | | | | make Google IO image clickableScott Main2013-04-231-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
* | | | | am 006119bf: Merge commit \'8237dd82\' into manualmergeSelim Gurun2013-04-230-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a': DO NOT MERGE Fix issues during backport
| * | | | Merge commit '8237dd82' into manualmergeSelim Gurun2013-04-230-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | am 93c39d5d: DO NOT MERGE Fix issues during backportSelim Gurun2013-04-051-3/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af': DO NOT MERGE Fix issues during backport
| | | * | DO NOT MERGE Fix issues during backportSelim Gurun2013-04-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f. Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
* | | | | am 00cfba95: Doc change: update support urls.Dirk Dougherty2013-04-221-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '00cfba95ce5ea3c081b9d7353998f80a7c6edbc9': Doc change: update support urls.
| * | | | Doc change: update support urls.Dirk Dougherty2013-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
* | | | | am 974af93d: Doc change: update payment detail for merch account.Dirk Dougherty2013-04-2213-42/+42
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '974af93de950b68616aed44985720e2978db5393': Doc change: update payment detail for merch account.
| * | | | Doc change: update payment detail for merch account.Dirk Dougherty2013-04-2213-42/+42
| | |_|/ | |/| | | | | | | | | | Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
* | | | Merge "Doc update: Fix firewall text." into jb-mr1.1-docskmccormick2013-04-221-3/+3
|\ \ \ \
generated by cgit v1.1 at 2024-09-14 21:51:43 +0000