Scott Main
a1063aa3fb
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
2013-07-11 18:14:52 -07:00
Scott Main
a60edcbee7
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
2013-07-11 18:12:01 -07:00
Scott Main
c079e43fc3
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
2013-07-11 18:09:53 -07:00
Dirk Dougherty
8b1cdd9874
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.
2013-07-11 18:08:36 -07:00
Scott Main
e920ab1a82
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
2013-07-11 18:08:01 -07:00
Dirk Dougherty
e34e65203f
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.
2013-07-11 18:06:22 -07:00
Scott Main
a618e93891
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
2013-07-11 18:05:44 -07:00
Scott Main
c660c608e7
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev
2013-07-12 01:03:22 +00:00
Dirk Dougherty
e470967919
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.
2013-07-11 18:03:17 -07:00
Dirk Dougherty
c1addd4750
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.
2013-07-11 18:01:26 -07:00
Dirk Dougherty
c7da42d764
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.
2013-07-11 17:59:22 -07:00
Dirk Dougherty
f7832a35f3
am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
...
* commit 'd6bbda24150eddc59865133377f6b41c8a1ed3b5':
Doc change: Update gcore reference docs.
2013-07-11 17:56:35 -07:00
Dirk Dougherty
d6bbda2415
am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
...
* commit 'bc5f9b66744b76c676543902d31d324f2dd02d09':
Doc change: Update gcore reference docs.
2013-07-11 17:54:00 -07:00
Dirk Dougherty
bc5f9b6674
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
2013-07-12 00:50:59 +00:00
Scott Main
717fb2b60d
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
2013-07-11 17:46:29 -07:00
Scott Main
334f6ea689
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
2013-07-11 17:44:09 -07:00
Scott Main
24810c6f58
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
2013-07-11 17:41:48 -07:00
Scott Main
3c13e5284e
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
2013-07-11 17:38:31 -07:00
Scott Main
536fa1bbe1
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
2013-07-11 17:36:53 -07:00
Scott Main
84ad0894be
fix markup error in download button and fix transition to install/update guide
...
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
2013-07-11 17:33:55 -07:00
Robert Greenwalt
6f2b31fcf5
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.
2013-07-11 17:09:14 -07:00
Robert Greenwalt
56a7e4ad43
am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
...
* commit '116d46659889f588fa9ffa5e1bc4dda90067fce6':
Block Wifi P2p discovery while doing dhcp.
2013-07-11 17:07:06 -07:00
Robert Greenwalt
116d466598
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
2013-07-12 00:04:45 +00:00
Scott Main
330cf2f7ff
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
2013-07-11 16:50:57 -07:00
Scott Main
7afc5ca353
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
2013-07-11 16:47:53 -07:00
Scott Main
57b0fed7a9
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
2013-07-11 16:44:58 -07:00
Scott Main
603c3d8a9a
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
2013-07-11 16:42:47 -07:00
Scott Main
3e82a9c9a5
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
2013-07-11 16:40:11 -07:00
Scott Main
276f0ce4df
update Android Studio for v0.2.0.
...
add release notes and troubleshooting topics
Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
2013-07-11 16:22:21 -07:00
Scott Main
52dc4bf58d
add Toshiba usb driver link
...
delete Fujitsu-Toshiba
bug: 9755017
Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364
2013-07-11 14:06:27 -07:00
Jeff Sharkey
df04f64434
am f8b69275: am 1f99a483: Recover from corrupt network stats.
...
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
Recover from corrupt network stats.
2013-07-11 11:41:24 -07:00
Jeff Sharkey
f8b692754f
am 1f99a483: Recover from corrupt network stats.
...
* commit '1f99a483e410811473b12d8efedd79c738df7af3':
Recover from corrupt network stats.
2013-07-11 11:38:50 -07:00
Jeff Sharkey
1f99a483e4
Recover from corrupt network stats.
...
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.
Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
2013-07-11 11:18:53 -07:00
Robert Greenwalt
6433ef2900
Block Wifi P2p discovery while doing dhcp.
...
bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
2013-07-11 11:10:08 -07:00
Dirk Dougherty
8f1a759727
Doc change: Update gcore reference docs.
...
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
2013-07-10 18:38:36 -07:00
The Android Open Source Project
8f4e09d2a8
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc
2013-07-10 08:34:50 -07:00
The Android Automerger
d1d1a6d068
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-10 05:55:25 -07:00
Elliott Hughes
f445a68567
am 0b18c149: am 0f50cb31: Merge "Fix build."
...
* commit '0b18c14931c4ca618c67b5ac5c8351246879e90a':
Fix build.
2013-07-09 17:53:32 -07:00
Elliott Hughes
0b18c14931
am 0f50cb31: Merge "Fix build."
...
* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b':
Fix build.
2013-07-09 17:51:34 -07:00
Elliott Hughes
0f50cb3198
Merge "Fix build."
2013-07-10 00:48:53 +00:00
Elliott Hughes
bfa5465ed2
Fix build.
...
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
2013-07-09 17:48:11 -07:00
The Android Open Source Project
f51538f444
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a
2013-07-09 17:13:14 -07:00
Ken Wakasa
2e55547acc
Revert "Stop marking gamepads as keyboards"
...
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.
Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
2013-07-09 16:32:15 -07:00
Vinit Deshpande
1f902a55f8
Revert "Temporarily disable 'Scan Always' mode"
...
This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.
Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
2013-07-09 16:32:07 -07:00
Elliott Hughes
dff4ec87e7
am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
...
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
Track libcore API change.
2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4
resolved conflicts for merge of 4a59376d to stage-aosp-master
...
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
2013-07-09 15:25:23 -07:00
Elliott Hughes
4a59376d5e
Merge "Track libcore API change."
2013-07-09 22:08:36 +00:00
Elliott Hughes
befd0b1bdf
Track libcore API change.
...
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
4d380d71e0
am fb231fea: am 425729f9: Merge "Empty commit"
...
* commit 'fb231fea6cd4dac7323b1df74006b294c3c9bfef':
Empty commit
2013-07-09 14:41:07 -07:00
Jean-Baptiste Queru
fb231fea6c
am 425729f9: Merge "Empty commit"
...
* commit '425729f92afc401f497e25b54460b1de8931c52e':
Empty commit
2013-07-09 14:39:29 -07:00
