OSDN Git Service
Scott Main [Fri, 12 Jul 2013 21:28:40 +0000 (14:28 -0700)]
am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:22:48 +0000 (14:22 -0700)]
am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:20:11 +0000 (14:20 -0700)]
am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
ca4b112eb243b1350aba000c4f021574be25bd96':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:17:30 +0000 (14:17 -0700)]
am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
546ac85a834cf033cf1f3ce82624f1f4a63d099f':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:15:15 +0000 (14:15 -0700)]
am
ad17523d: add warning for Windows users and fix typos
* commit '
ad17523da976c2d6b7b70fd3aa9ad290e4731224':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
Wink Saville [Fri, 12 Jul 2013 19:03:53 +0000 (12:03 -0700)]
am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 19:01:41 +0000 (12:01 -0700)]
am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
925ec03fcd9651ff4c6b04982eb6d930b16493b9':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 18:59:03 +0000 (18:59 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Amith Yamasani [Fri, 12 Jul 2013 18:21:27 +0000 (11:21 -0700)]
am
1a1a7c08: am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:19:24 +0000 (11:19 -0700)]
am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
06a441de3b6756cf49879ff445ac26c66da54d02':
Pass along the user id to AttributeCache requests
Amith Yamasani [Fri, 12 Jul 2013 18:17:09 +0000 (18:17 +0000)]
Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
The Android Open Source Project [Fri, 12 Jul 2013 14:27:43 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
Elliott Hughes [Fri, 12 Jul 2013 01:55:54 +0000 (18:55 -0700)]
am
f094eefc: am
c5de9c35: Merge "Track libcore API update."
* commit '
f094eefc34013c7167effa558b488709eaa54751':
Track libcore API update.
Elliott Hughes [Fri, 12 Jul 2013 01:52:11 +0000 (18:52 -0700)]
am
c5de9c35: Merge "Track libcore API update."
* commit '
c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
Track libcore API update.
Scott Main [Fri, 12 Jul 2013 01:14:52 +0000 (18:14 -0700)]
am
a60edcbe: am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a60edcbee7d99058eb689761097826adac0593e7':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:12:01 +0000 (18:12 -0700)]
am
c079e43f: am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c079e43fc317087ae5517ee7d9a376e97fef0f57':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:09:53 +0000 (18:09 -0700)]
am
e920ab1a: am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
e920ab1a82327976e0a25842d7d57dc7a92ba604':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:08:36 +0000 (18:08 -0700)]
am
e34e6520: am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e34e65203f8188849cfebb901c4efe5b5b4ad8d5':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:08:01 +0000 (18:08 -0700)]
am
a618e938: am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
a618e93891603f825fd2c0ec1a67c96c29863dcd':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Dirk Dougherty [Fri, 12 Jul 2013 01:06:22 +0000 (18:06 -0700)]
am
e4709679: am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
e4709679198590fa37fbad67df0d7e3827c4f8cf':
Doc change: Update gcore reference docs.
Scott Main [Fri, 12 Jul 2013 01:05:44 +0000 (18:05 -0700)]
am
c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
* commit '
c660c608e75791d5b4b286f34a9ec335f9e95ba6':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
Scott Main [Fri, 12 Jul 2013 01:03:22 +0000 (01:03 +0000)]
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017" into jb-mr1.1-ub-dev
Dirk Dougherty [Fri, 12 Jul 2013 01:03:17 +0000 (18:03 -0700)]
am
c1addd47: am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c1addd4750be5b1721a8668a110e74fa59e476c6':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 01:01:26 +0000 (18:01 -0700)]
am
c7da42d7: am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
c7da42d76470c4e9fb541058e942e31163275b83':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:59:22 +0000 (17:59 -0700)]
am
f7832a35: am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
f7832a35f3961e1b6665b5428899cdad598f0544':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:56:35 +0000 (17:56 -0700)]
am
d6bbda24: am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
d6bbda24150eddc59865133377f6b41c8a1ed3b5':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:54:00 +0000 (17:54 -0700)]
am
bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
* commit '
bc5f9b66744b76c676543902d31d324f2dd02d09':
Doc change: Update gcore reference docs.
Dirk Dougherty [Fri, 12 Jul 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Scott Main [Fri, 12 Jul 2013 00:46:29 +0000 (17:46 -0700)]
am
334f6ea6: am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
334f6ea68945dd642e6a924bf399d2afd21bf107':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:44:09 +0000 (17:44 -0700)]
am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
24810c6f5854e595b2c78f9c3e44b7d4045a7472':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:41:48 +0000 (17:41 -0700)]
am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
3c13e5284e83390301bf3306e5d77f7014483ea0':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:38:31 +0000 (17:38 -0700)]
am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
536fa1bbe10b793e7c5d585c974693349fb8a4f5':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:36:53 +0000 (17:36 -0700)]
am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
84ad0894be13b374b9b75e204dabea6a1579e131':
fix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:26:13 +0000 (17:26 -0700)]
fix markup error in download button and fix transition to install/update guide
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 12 Jul 2013 00:09:14 +0000 (17:09 -0700)]
am
56a7e4ad: am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
56a7e4ad43eb5288a80b34566db365aaaa845e87':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:07:06 +0000 (17:07 -0700)]
am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
116d46659889f588fa9ffa5e1bc4dda90067fce6':
Block Wifi P2p discovery while doing dhcp.
Robert Greenwalt [Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)]
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
Scott Main [Thu, 11 Jul 2013 23:50:57 +0000 (16:50 -0700)]
am
7afc5ca3: am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
7afc5ca353c9b4a3839c988fe6c281289495a18a':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:47:53 +0000 (16:47 -0700)]
am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:44:58 +0000 (16:44 -0700)]
am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:42:47 +0000 (16:42 -0700)]
am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 23:40:11 +0000 (16:40 -0700)]
am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
276f0ce4df7f58786da08c34f548456129144aed':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
Scott Main [Thu, 11 Jul 2013 22:31:10 +0000 (15:31 -0700)]
update Android Studio for v0.2.0.
add release notes and troubleshooting topics
Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
Scott Main [Tue, 9 Jul 2013 17:43:45 +0000 (10:43 -0700)]
add Toshiba usb driver link
delete Fujitsu-Toshiba
bug:
9755017
Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364
Jeff Sharkey [Thu, 11 Jul 2013 18:41:24 +0000 (11:41 -0700)]
am
f8b69275: am
1f99a483: Recover from corrupt network stats.
* commit '
f8b692754f7739e11c8438ab59c0760194cfacc5':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:38:50 +0000 (11:38 -0700)]
am
1f99a483: Recover from corrupt network stats.
* commit '
1f99a483e410811473b12d8efedd79c738df7af3':
Recover from corrupt network stats.
Jeff Sharkey [Thu, 11 Jul 2013 18:18:53 +0000 (11:18 -0700)]
Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug:
9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
Robert Greenwalt [Fri, 28 Jun 2013 22:55:28 +0000 (15:55 -0700)]
Block Wifi P2p discovery while doing dhcp.
bug:
9531609
bug:
9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
Elliott Hughes [Thu, 11 Jul 2013 17:09:14 +0000 (17:09 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Thu, 11 Jul 2013 17:06:35 +0000 (10:06 -0700)]
Track libcore API update.
Change-Id: I7ad4ee87008c2ba0f8f16d1c86d81b8114359e04
Wink Saville [Thu, 11 Jul 2013 06:00:07 +0000 (23:00 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Dirk Dougherty [Fri, 28 Jun 2013 21:04:39 +0000 (14:04 -0700)]
Doc change: Update gcore reference docs.
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
Amith Yamasani [Wed, 10 Jul 2013 23:18:01 +0000 (16:18 -0700)]
Pass along the user id to AttributeCache requests
Bug:
9759331
Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117
The Android Open Source Project [Wed, 10 Jul 2013 15:34:50 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc
The Android Automerger [Wed, 10 Jul 2013 12:55:25 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 10 Jul 2013 00:53:32 +0000 (17:53 -0700)]
Elliott Hughes [Wed, 10 Jul 2013 00:51:34 +0000 (17:51 -0700)]
Elliott Hughes [Wed, 10 Jul 2013 00:48:52 +0000 (00:48 +0000)]
Merge "Fix build."
Elliott Hughes [Wed, 10 Jul 2013 00:48:11 +0000 (17:48 -0700)]
Fix build.
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
The Android Open Source Project [Wed, 10 Jul 2013 00:13:13 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a
Ken Wakasa [Fri, 5 Jul 2013 04:08:36 +0000 (04:08 +0000)]
Revert "Stop marking gamepads as keyboards"
This reverts commit
74c8fb601ef75d8e12df5221489c41c125e3b846.
Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug:
8896129
Vinit Deshpande [Wed, 3 Jul 2013 00:10:53 +0000 (00:10 +0000)]
Revert "Temporarily disable 'Scan Always' mode"
This reverts commit
c16b0d0061108685e74b40d77ad801fe0304bc42.
Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
Elliott Hughes [Tue, 9 Jul 2013 22:28:51 +0000 (15:28 -0700)]
am
e16a21c6: resolved conflicts for merge of
4a59376d to stage-aosp-master
* commit '
e16a21c6b4f108813e5f5e00f30e0ff075de504c':
Track libcore API change.
Elliott Hughes [Tue, 9 Jul 2013 22:24:13 +0000 (15:24 -0700)]
resolved conflicts for merge of
4a59376d to stage-aosp-master
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
Elliott Hughes [Tue, 9 Jul 2013 22:08:36 +0000 (22:08 +0000)]
Merge "Track libcore API change."
Elliott Hughes [Tue, 9 Jul 2013 21:46:18 +0000 (14:46 -0700)]
Track libcore API change.
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:41:07 +0000 (14:41 -0700)]
am
fb231fea: am
425729f9: Merge "Empty commit"
* commit '
fb231fea6cd4dac7323b1df74006b294c3c9bfef':
Empty commit
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:39:29 +0000 (14:39 -0700)]
am
425729f9: Merge "Empty commit"
* commit '
425729f92afc401f497e25b54460b1de8931c52e':
Empty commit
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:37:50 +0000 (21:37 +0000)]
Merge "Empty commit"
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:34:06 +0000 (14:34 -0700)]
Empty commit
Work around a Gerrit issue.
Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
Scott Main [Tue, 9 Jul 2013 17:58:43 +0000 (10:58 -0700)]
am
c4570b32: am
29282f99: am
b1b693ee: am
5e0582cc: am
7cf27aa8: Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
* commit '
c4570b32d87079a5ff81262c1646fa0301b7f3b9':
update url for backup service key bug:
8834302
Dirk Dougherty [Tue, 9 Jul 2013 17:58:40 +0000 (10:58 -0700)]
am
ec47cc77: am
0f97f351: am
cfb8f9a0: am
3059c708: am
d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '
ec47cc7724464f0ce88456462cbd69aca9a6838e':
docs: add link to developer survey on main landing pages
Scott Main [Tue, 9 Jul 2013 17:56:35 +0000 (10:56 -0700)]
am
29282f99: am
b1b693ee: am
5e0582cc: am
7cf27aa8: Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
* commit '
29282f99252237dd9674737d26ce72afbfdd3ac1':
update url for backup service key bug:
8834302
Dirk Dougherty [Tue, 9 Jul 2013 17:56:32 +0000 (10:56 -0700)]
am
0f97f351: am
cfb8f9a0: am
3059c708: am
d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '
0f97f3510bbef333887440b6f0bc65aea2352597':
docs: add link to developer survey on main landing pages
Scott Main [Tue, 9 Jul 2013 17:54:18 +0000 (10:54 -0700)]
am
b1b693ee: am
5e0582cc: am
7cf27aa8: Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
* commit '
b1b693eec6e171a059190e6f17ff53b8c558cbb3':
update url for backup service key bug:
8834302
Dirk Dougherty [Tue, 9 Jul 2013 17:54:13 +0000 (10:54 -0700)]
am
cfb8f9a0: am
3059c708: am
d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '
cfb8f9a07681cc090428a47aa856cba51be29ce5':
docs: add link to developer survey on main landing pages
Scott Main [Tue, 9 Jul 2013 17:52:44 +0000 (10:52 -0700)]
am
5e0582cc: am
7cf27aa8: Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
* commit '
5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
update url for backup service key bug:
8834302
Dirk Dougherty [Tue, 9 Jul 2013 17:52:40 +0000 (10:52 -0700)]
am
3059c708: am
d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '
3059c70844848c7bd1aad7bffd2d5828cf745540':
docs: add link to developer survey on main landing pages
Scott Main [Tue, 9 Jul 2013 17:51:18 +0000 (10:51 -0700)]
am
7cf27aa8: Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
* commit '
7cf27aa8e3fe4735d1cf787917a524e472376e6e':
update url for backup service key bug:
8834302
Dirk Dougherty [Tue, 9 Jul 2013 17:51:15 +0000 (10:51 -0700)]
am
d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '
d5fee1644ec9829400dda77c650694f41c5decc3':
docs: add link to developer survey on main landing pages
Scott Main [Tue, 9 Jul 2013 17:50:18 +0000 (17:50 +0000)]
Merge "update url for backup service key bug:
8834302" into jb-mr1.1-ub-dev
Dirk Dougherty [Tue, 9 Jul 2013 17:50:07 +0000 (17:50 +0000)]
Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
Scott Main [Tue, 9 Jul 2013 17:48:02 +0000 (10:48 -0700)]
update url for backup service key
bug:
8834302
Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
Satoshi Kataoka [Tue, 9 Jul 2013 17:25:02 +0000 (10:25 -0700)]
am
8b95d259: am
b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
* commit '
8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b':
Revert "Stop marking gamepads as keyboards"
Satoshi Kataoka [Tue, 9 Jul 2013 17:23:00 +0000 (10:23 -0700)]
am
b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
* commit '
b7925f2219480d4ddbb1c655b9b386ed031815a3':
Revert "Stop marking gamepads as keyboards"
Satoshi Kataoka [Tue, 9 Jul 2013 17:20:37 +0000 (17:20 +0000)]
Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
Joe Malin [Tue, 9 Jul 2013 17:11:05 +0000 (10:11 -0700)]
am
216e340b: am
ea4193ef: am
46e8ca92: am
a4d3dedc: am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
216e340b72375c5888d1023226582f75c1ed6b98':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:09:00 +0000 (10:09 -0700)]
am
ea4193ef: am
46e8ca92: am
a4d3dedc: am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
ea4193efaafb280e9e969cae72a4f43b913ae8b0':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:05:47 +0000 (10:05 -0700)]
am
46e8ca92: am
a4d3dedc: am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
46e8ca926cb9345e37ca35947d8a8ba3c131bda9':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:04:19 +0000 (10:04 -0700)]
am
a4d3dedc: am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
a4d3dedcb18c56768bebeb3a41e257b80626f0fd':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:02:44 +0000 (10:02 -0700)]
am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
420b8212399589709b12d97323a56745480aa152':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:01:42 +0000 (10:01 -0700)]
am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
a59eb93d1954a36b25a6277c0ce3145ce115d460':
Doc Bug:
b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 16:59:10 +0000 (09:59 -0700)]
am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
a62413772e6b5dad3a018c667ded5412e235c142':
Doc Bug:
b9739899 Bugs in Sync Adapters training
The Android Open Source Project [Tue, 9 Jul 2013 16:37:30 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I033d0d25ecba2644ce84b294be1af7a1ab7951f2
The Android Automerger [Tue, 9 Jul 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Scott Main [Tue, 9 Jul 2013 01:22:42 +0000 (18:22 -0700)]
am
0ebc82fe: am
597d7040: am
61e1a650: am
e4d65d24: am
eceeaf11: add link to cloud backend blog post
* commit '
0ebc82fe79966882bf6cf798afa6c67e1fc7d196':
add link to cloud backend blog post
Scott Main [Tue, 9 Jul 2013 01:20:40 +0000 (18:20 -0700)]
am
597d7040: am
61e1a650: am
e4d65d24: am
eceeaf11: add link to cloud backend blog post
* commit '
597d7040309d86e366be7804238750ccc733a7ad':
add link to cloud backend blog post
Scott Main [Tue, 9 Jul 2013 01:18:26 +0000 (18:18 -0700)]
am
61e1a650: am
e4d65d24: am
eceeaf11: add link to cloud backend blog post
* commit '
61e1a650c032c1169c31aad7e0aed085c400327d':
add link to cloud backend blog post
OSDN Git Service
