OSDN Git Service
Dirk Dougherty [Tue, 21 May 2013 17:07:03 +0000 (10:07 -0700)]
am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
Doc change: fix doc title.
Dirk Dougherty [Tue, 21 May 2013 17:05:08 +0000 (17:05 +0000)]
Merge "Doc change: fix doc title." into jb-mr1.1-docs
Dirk Dougherty [Tue, 21 May 2013 17:03:35 +0000 (10:03 -0700)]
Doc change: fix doc title.
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
Dirk Dougherty [Tue, 21 May 2013 01:09:46 +0000 (18:09 -0700)]
am
4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
* commit '
4a3c55846ad488e68236837504ffd953498eb9fb':
Doc change: fix tiny url.
Dirk Dougherty [Tue, 21 May 2013 01:07:33 +0000 (01:07 +0000)]
Merge "Doc change: fix tiny url." into jb-mr1.1-docs
Dirk Dougherty [Mon, 20 May 2013 20:45:04 +0000 (13:45 -0700)]
Doc change: fix tiny url.
Change-Id: Iea59aadd7b83e8f076e65b75fbb4bd9109e26307
Dirk Dougherty [Wed, 15 May 2013 13:38:32 +0000 (06:38 -0700)]
am
9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '
9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
Doc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 13:35:10 +0000 (06:35 -0700)]
am
8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs
* commit '
8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
Doc change: updates to location landing.
Dirk Dougherty [Wed, 15 May 2013 13:34:31 +0000 (13:34 +0000)]
Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:33:06 +0000 (13:33 +0000)]
Merge "Doc change: updates to location landing." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 06:25:49 +0000 (23:25 -0700)]
Doc change: updates to location landing.
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
Dirk Dougherty [Wed, 15 May 2013 11:28:25 +0000 (04:28 -0700)]
Doc change: add redirects for edu urls.
Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611
Dirk Dougherty [Wed, 15 May 2013 11:24:49 +0000 (04:24 -0700)]
am
6402d93e: Doc change: add files for edu content.
* commit '
6402d93ed8ff6712c0b9787188607e5a9b212602':
Doc change: add files for edu content.
Dirk Dougherty [Tue, 7 May 2013 00:27:04 +0000 (17:27 -0700)]
Doc change: add files for edu content.
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
Dirk Dougherty [Wed, 15 May 2013 09:47:04 +0000 (02:47 -0700)]
am
a38ca33d: Doc change: update gms and gcm reference TOC.
* commit '
a38ca33d17f40a0a67855b2ec1b5895a5157b851':
Doc change: update gms and gcm reference TOC.
Dirk Dougherty [Wed, 15 May 2013 09:36:33 +0000 (02:36 -0700)]
Doc change: update gms and gcm reference TOC.
Change-Id: I24b9506c3111a744c26e0c6c2b94192402684c80
Dirk Dougherty [Wed, 15 May 2013 09:17:13 +0000 (02:17 -0700)]
am
f895a806: Doc change: Reorganize structure of Google Services nav.
* commit '
f895a806adadfb42c98b5885e91adbe7b29d3452':
Doc change: Reorganize structure of Google Services nav.
Dirk Dougherty [Sat, 4 May 2013 17:40:12 +0000 (10:40 -0700)]
Doc change: Reorganize structure of Google Services nav.
Change-Id: Iad23e238fb501a700c2d7d6f736ae8c305810531
Scott Main [Wed, 15 May 2013 07:57:04 +0000 (00:57 -0700)]
am
c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit '
c06cbc3dacbf43707c02c836d805413a716e34d7':
add docs for new IDE installing guide, migration guide, tips docs, and download page
Scott Main [Wed, 15 May 2013 07:54:30 +0000 (07:54 +0000)]
Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
Scott Main [Sat, 20 Apr 2013 00:42:08 +0000 (17:42 -0700)]
add docs for new IDE
installing guide, migration guide, tips docs, and download page
Change-Id: Ia884c95a20de28863a80ba1e985841a44e5e453c
Dirk Dougherty [Wed, 15 May 2013 05:27:23 +0000 (22:27 -0700)]
am
1519c299: Merge "Doc change: Add docs for test purchases." into jb-mr1.1-docs
* commit '
1519c2991eae7aae25b395b0d042a592ba2a3d84':
Doc change: Add docs for test purchases.
Dirk Dougherty [Wed, 15 May 2013 05:25:10 +0000 (05:25 +0000)]
Merge "Doc change: Add docs for test purchases." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 02:14:11 +0000 (19:14 -0700)]
Doc change: Add docs for test purchases.
Change-Id: Ic686cd220a6af8676567bd87a9769fc985189cd3
Joe Fernandez [Wed, 15 May 2013 01:29:21 +0000 (18:29 -0700)]
am
85cd4ead: Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
* commit '
85cd4ead84b893bb7e8896ce692845318943a578':
docs: Android SDK/ADT 22.0 Release Notes
Joe Fernandez [Wed, 15 May 2013 01:27:18 +0000 (01:27 +0000)]
Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
Joe Fernandez [Wed, 27 Mar 2013 18:30:34 +0000 (11:30 -0700)]
docs: Android SDK/ADT 22.0 Release Notes
SDK 22 Release Notes for Google I/O 2013 release
Change-Id: I56f4db97b8cc1ae178ba0ab4f2391d074a658f0b
Glenn Kasten [Tue, 14 May 2013 19:48:13 +0000 (12:48 -0700)]
am
068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
* commit '
068e2315ff61d2aadd8ee78b25deeef27084dc64':
A/V sync and latency PCB
Glenn Kasten [Tue, 14 May 2013 19:45:36 +0000 (19:45 +0000)]
Merge "A/V sync and latency PCB" into jb-mr1.1-docs
kmccormick [Tue, 14 May 2013 18:27:34 +0000 (11:27 -0700)]
am
0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs
* commit '
0bf8c6f9264337450f9ba1d6e66888e527dd6164':
Doc update: CCS and notifications
kmccormick [Tue, 14 May 2013 18:25:41 +0000 (18:25 +0000)]
Merge "Doc update: CCS and notifications" into jb-mr1.1-docs
Dirk Dougherty [Tue, 14 May 2013 18:05:42 +0000 (11:05 -0700)]
am
70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs
* commit '
70b0728b78e68a5d12c68501dfede719dfa1ed88':
Doc change: Add localization checklist.
Dirk Dougherty [Tue, 14 May 2013 18:05:38 +0000 (11:05 -0700)]
am
53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs
* commit '
53559d0b50dcde778ff7630c344dd1c07beef96d':
Doc change: Clean refresh of gms reference to remove unused.
Dirk Dougherty [Tue, 14 May 2013 16:53:32 +0000 (16:53 +0000)]
Merge "Doc change: Add localization checklist." into jb-mr1.1-docs
Dirk Dougherty [Tue, 14 May 2013 16:35:01 +0000 (16:35 +0000)]
Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs
Dirk Dougherty [Thu, 9 May 2013 01:37:11 +0000 (18:37 -0700)]
Doc change: Add localization checklist.
Change-Id: Ib5dbb72d99bb36a01e93256a8c4569cfba113651
Dirk Dougherty [Tue, 14 May 2013 07:18:36 +0000 (00:18 -0700)]
Doc change: Clean refresh of gms reference to remove unused.
Change-Id: Iaa64d6855397a1290153cac48c5f7d1465332f96
Dirk Dougherty [Tue, 14 May 2013 07:08:23 +0000 (00:08 -0700)]
am
23a87b23: Doc change: a new image for play services location landing.
* commit '
23a87b23909e833de388bb47bfa6ddb7f33c8582':
Doc change: a new image for play services location landing.
Dirk Dougherty [Tue, 14 May 2013 06:59:20 +0000 (23:59 -0700)]
Doc change: a new image for play services location landing.
Change-Id: If66a0272fedebbc0191e966938d2cc50e4758bb6
Joe Malin [Tue, 14 May 2013 06:27:13 +0000 (23:27 -0700)]
am
cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs
* commit '
cd70c8736919a2750777ba5c7f655c650584fcf4':
Android U: Making Apps Location-Aware
Joe Malin [Tue, 14 May 2013 04:12:17 +0000 (04:12 +0000)]
Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs
Joe Malin [Mon, 4 Mar 2013 18:33:30 +0000 (10:33 -0800)]
Android U: Making Apps Location-Aware
Change-Id: I8f44c6ca6d797ceb8ada5b2c723a8cca0081cf0a
kmccormick [Thu, 18 Apr 2013 17:57:59 +0000 (10:57 -0700)]
Doc update: CCS and notifications
Change-Id: I607441a39b420ef1ebcaeb676a4f97dcd7286fe3
Glenn Kasten [Mon, 13 May 2013 23:21:02 +0000 (16:21 -0700)]
A/V sync and latency PCB
Change-Id: If6a0babb25541386fa4391c9a88c690a1f64dace
Dirk Dougherty [Mon, 13 May 2013 19:02:48 +0000 (12:02 -0700)]
am
e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs
* commit '
e6f1a2abaf24d9a9c4f91d2e76679d47ece1069b':
Doc change: Updates to gpgs landing.
Dirk Dougherty [Mon, 13 May 2013 19:00:25 +0000 (19:00 +0000)]
Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs
Dirk Dougherty [Sat, 4 May 2013 19:02:17 +0000 (12:02 -0700)]
Doc change: Updates to gpgs landing.
Change-Id: Iec8aea322ec7ad7fde176171ed8a63fdbff4744b
Dirk Dougherty [Mon, 13 May 2013 16:59:05 +0000 (09:59 -0700)]
am
730c32c5: Doc change: update gps 3.1 reference docs.
* commit '
730c32c5acede2a1e56f904bd8b66191c4f53b1b':
Doc change: update gps 3.1 reference docs.
Dirk Dougherty [Sun, 12 May 2013 06:18:35 +0000 (23:18 -0700)]
Doc change: update gps 3.1 reference docs.
Bug:
8918191
Change-Id: I3b74aad404eee7420673e04d13a2eb31b60ec833
Dirk Dougherty [Fri, 10 May 2013 00:53:37 +0000 (17:53 -0700)]
am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
4da9c11b2758d55c67f7a24c3eb519c36497ba5d':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 00:53:34 +0000 (17:53 -0700)]
am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
4e3773d3f626595c703d26dea1f354c37ad76bde':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 00:37:51 +0000 (00:37 +0000)]
Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
Dirk Dougherty [Thu, 9 May 2013 22:04:08 +0000 (15:04 -0700)]
Doc change: refresh gms/gcm reference docs.
Change-Id: Ife17b6b3dfb387bc7de6c827c0e6db19a756534f
Scott Main [Thu, 9 May 2013 23:30:09 +0000 (23:30 +0000)]
Merge "update homepage with IO Live banner" into jb-mr1.1-docs
Scott Main [Wed, 8 May 2013 19:56:53 +0000 (12:56 -0700)]
am
148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
* commit '
148ce2322c5ce119b2dc6881d60dc60f8c336bfa':
delete obsolete tips/references to cupcake
Scott Main [Wed, 8 May 2013 19:50:52 +0000 (19:50 +0000)]
Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
Scott Main [Tue, 7 May 2013 21:15:42 +0000 (14:15 -0700)]
update homepage with IO Live banner
Change-Id: Ifd333287a04c426df4db2c00a1f19560c304b839
Scott Main [Tue, 7 May 2013 17:15:11 +0000 (10:15 -0700)]
am
c98612a9: some more search tags
* commit '
c98612a9b2293f8ae29389dd484d7b384c7d37ad':
some more search tags
Scott Main [Wed, 24 Apr 2013 18:43:41 +0000 (11:43 -0700)]
some more search tags
Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
Dirk Dougherty [Tue, 7 May 2013 01:41:31 +0000 (18:41 -0700)]
am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
b582c678c88df2848023b7f27f4bc0ab2249e1e1':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Sat, 4 May 2013 17:54:52 +0000 (10:54 -0700)]
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490
Scott Main [Tue, 7 May 2013 00:16:26 +0000 (17:16 -0700)]
am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
1cd65b30904b07ae4226a6e438647ee3b63d7950':
delete a few unused/obsolete files and add redirects
Scott Main [Mon, 6 May 2013 23:51:39 +0000 (16:51 -0700)]
delete a few unused/obsolete files and add redirects
Change-Id: Icbcb0f042ac5f05d17d42be4c5c122316e93b866
Scott Main [Mon, 6 May 2013 23:38:42 +0000 (16:38 -0700)]
delete obsolete tips/references to cupcake
Change-Id: Ib1ddb19c42840aa830acd85a89e78c149e2f66e9
Christopher Tate [Mon, 6 May 2013 22:12:07 +0000 (15:12 -0700)]
am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
f7918b4a1e06350ba4d69fe47327db830cd4e8ba':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 22:00:53 +0000 (15:00 -0700)]
am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
d3a57029e80073aa3c7dfe1dbc8945d32968f6ae':
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
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
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
Dirk Dougherty [Sat, 4 May 2013 17:29:01 +0000 (10:29 -0700)]
am
c3a7ea42: Doc change: Update landing pages for Google Play Services.
* commit '
c3a7ea424d96aac02762ab6819429e3fa52d9a25':
Doc change: Update landing pages for Google Play Services.
Dirk Dougherty [Fri, 3 May 2013 20:11:51 +0000 (13:11 -0700)]
Doc change: Update landing pages for Google Play Services.
Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
quddusc [Fri, 3 May 2013 18:45:08 +0000 (11:45 -0700)]
am
9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs
* commit '
9af9744319f389b6583b8c39ea65bf90afc10fe5':
docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
quddusc [Fri, 3 May 2013 18:42:44 +0000 (18:42 +0000)]
Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr1.1-docs
quddusc [Mon, 4 Feb 2013 23:05:23 +0000 (15:05 -0800)]
docs: Added landing page for Google Play Games Platform Services.
cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
Change-Id: I0e5e2c69fc0d13b0637504e5fd3e76c1a91a0109
Scott Main [Wed, 1 May 2013 21:26:05 +0000 (14:26 -0700)]
am
47dcb666: dashboard update for 5/1
* commit '
47dcb66610fbe9284f83f73a06a5c23515e17fbd':
dashboard update for 5/1
Adam Koch [Wed, 1 May 2013 18:52:26 +0000 (11:52 -0700)]
am
bbed0513: Contacts Provider Training - fix minor code snippet typos.
* commit '
bbed0513abb1d98733f0eed5399f4cb195fda55f':
Contacts Provider Training - fix minor code snippet typos.
Scott Main [Wed, 1 May 2013 17:32:47 +0000 (10:32 -0700)]
dashboard update for 5/1
Change-Id: I9cdcf2934a5332fee50067e0b6f8f3f159373892
Adam Koch [Wed, 1 May 2013 16:21:20 +0000 (12:21 -0400)]
Contacts Provider Training - fix minor code snippet typos.
Change-Id: I3edf86d276d877914a3d97e596e1bb35d1b1ce1f
Nick Kralevich [Mon, 29 Apr 2013 22:44:43 +0000 (15:44 -0700)]
am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
292c979a0f1e503422924421557b146cd28fc0d2':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:42:54 +0000 (15:42 -0700)]
am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
d440ca76029ab6f0909fdd9495941e04b90e5da7':
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
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
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
Dirk Dougherty [Thu, 25 Apr 2013 02:42:49 +0000 (19:42 -0700)]
am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
bdf19c62d841163f5c3434f3533e003f58816e0e':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:40:02 +0000 (19:40 -0700)]
am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
29743661734d8e2b7b3c33e635557c3f2ef9d8a0':
Doc 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
kmccormick [Wed, 24 Apr 2013 22:57:25 +0000 (15:57 -0700)]
am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
fd61958f75212a70bffebd79ad0876b7ad785f55':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 22:42:57 +0000 (15:42 -0700)]
Doc Update: bug fix in SensorEvent ref
"Bug:
6349093"
Change-Id: Ibd4911b6c3f17fd2cd18042665efa428231c61ab
Dirk Dougherty [Wed, 24 Apr 2013 19:12:37 +0000 (12:12 -0700)]
am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
c0edc45fd20832b52e8d0f91632f616da585b7dd':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:10:34 +0000 (12:10 -0700)]
am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
dacaad4ab21bfe8d6de74d60d2ce881d2a276a9d':
Doc change: Add tablet optimization tips info/link.
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
Dirk Dougherty [Mon, 22 Apr 2013 19:12:44 +0000 (12:12 -0700)]
Doc change: Add tablet optimization tips info/link.
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
Scott Main [Tue, 23 Apr 2013 19:34:30 +0000 (12:34 -0700)]
am
7653fbee: make Google IO image clickable
* commit '
7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:32:24 +0000 (12:32 -0700)]
make Google IO image clickable
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
Selim Gurun [Tue, 23 Apr 2013 19:20:53 +0000 (12:20 -0700)]
am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
22a946d36af4ea69956531c89f0d0852497c3892':
DO NOT MERGE Fix issues during backport
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 [Tue, 23 Apr 2013 00:01:21 +0000 (17:01 -0700)]
am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
c7523804c890cd7ed3b61f51b9f5d029320fd406':
Doc change: update support urls.
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
OSDN Git Service
