OSDN Git Service
Wink Saville [Fri, 12 Jul 2013 19:14:01 +0000 (12:14 -0700)]
am
97b077bc: am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
97b077bc18752e7dafe041cb04c19e67ce69939c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
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:25:24 +0000 (11:25 -0700)]
am
8361a9f7: am
1a1a7c08: am
06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '
8361a9f719b6a416a40134951daf28297b6e0670':
Pass along the user id to AttributeCache requests
Adam Powell [Fri, 12 Jul 2013 18:22:30 +0000 (18:22 +0000)]
Merge "Always show overflow buttons on action bars"
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
Marco Nelissen [Fri, 12 Jul 2013 14:34:40 +0000 (14:34 +0000)]
Merge "Add stopservice command to am"
The Android Open Source Project [Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)]
am
a4ee3088: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
a4ee3088e74bb9b38dcd469df4dc929f1c935ff3':
Recover from corrupt network stats.
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
Lorenzo Colitti [Fri, 12 Jul 2013 03:33:16 +0000 (03:33 +0000)]
Merge "Make legacy VPN work over stacked interfaces."
Elliott Hughes [Fri, 12 Jul 2013 02:01:40 +0000 (19:01 -0700)]
am
9c8685b7: am
f094eefc: am
c5de9c35: Merge "Track libcore API update."
* commit '
9c8685b714b38c2bbf09077b9cba73a95b734269':
Track libcore API update.
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:16:37 +0000 (18:16 -0700)]
am
a1063aa3: 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 '
a1063aa3fb6619caf59c2c139c1800a427bbafb5':
add Toshiba usb driver link delete Fujitsu-Toshiba bug:
9755017
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
Dirk Dougherty [Fri, 12 Jul 2013 01:09:59 +0000 (18:09 -0700)]
am
8b1cdd98: 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 '
8b1cdd9874e88569fcf46d848f8f3424dfa7afc9':
Doc change: Update gcore reference docs.
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.
Vinit Deshapnde [Fri, 12 Jul 2013 00:58:07 +0000 (00:58 +0000)]
Merge "Allow enabling TDLS on specific routes"
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:48:00 +0000 (17:48 -0700)]
am
717fb2b6: am
334f6ea6: am
24810c6f: am
3c13e528: am
536fa1bb: am
84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '
717fb2b60d91604175f73984b1eaf8c169ae155b':
fix markup error in download button and fix transition to install/update guide
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
Romain Guy [Fri, 12 Jul 2013 00:41:24 +0000 (00:41 +0000)]
Merge "Trace bitmaps decoding"
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
Romain Guy [Fri, 12 Jul 2013 00:37:31 +0000 (17:37 -0700)]
Trace bitmaps decoding
Also remove dead code
Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
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:12:35 +0000 (17:12 -0700)]
am
6f2b31fc: am
56a7e4ad: am
116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '
6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
Block Wifi P2p discovery while doing dhcp.
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:53:19 +0000 (16:53 -0700)]
am
330cf2f7: am
7afc5ca3: am
57b0fed7: am
603c3d8a: am
3e82a9c9: am
276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics
* commit '
330cf2f7ffc619d51bce7901590c33adc4b0c863':
update Android Studio for v0.2.0. add release notes and troubleshooting topics
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
Adam Powell [Thu, 11 Jul 2013 22:50:37 +0000 (22:50 +0000)]
Merge "Un-hide all ViewParent methods"
Adam Powell [Thu, 11 Jul 2013 22:25:59 +0000 (15:25 -0700)]
Un-hide all ViewParent methods
Make it possible for code outside the framework to implement the
ViewParent interface.
Change-Id: Ic1b4eb15a4b3da1d16c92b59e039d89861d893e4
Geremy Condra [Thu, 11 Jul 2013 22:25:14 +0000 (22:25 +0000)]
Merge "Permissions to protect socket marking settings"
Igor Murashkin [Thu, 11 Jul 2013 22:17:37 +0000 (22:17 +0000)]
Merge "camera2 api: Add CameraMetadata get/set support"
Vinit Deshapnde [Thu, 11 Jul 2013 22:12:44 +0000 (15:12 -0700)]
Allow enabling TDLS on specific routes
This change exposes couple of internal APIs to enable TDLS between local
machine and a remote machine. The implementation translates client provided
remote IP to a MAC address using system ARP cache, and then instructs the
driver to enable TDLS with that endpoint. Another API takes application
specified MAC address.
Bug:
8538898
Change-Id: Ida343fc42ba3a817a4f380255596e7fb7fcdfb9b
Jeff Sharkey [Thu, 11 Jul 2013 21:23:28 +0000 (14:23 -0700)]
am
df04f644: am
f8b69275: am
1f99a483: Recover from corrupt network stats.
* commit '
df04f64434f3310d3eb71d332935616fcdc497a2':
Recover from corrupt network stats.
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
Adam Powell [Thu, 11 Jul 2013 20:25:58 +0000 (13:25 -0700)]
Always show overflow buttons on action bars
The menu button is not pining, it's passed on! This button is no more!
It has ceased to be! It's expired and gone to meet its maker! It's a
stiff! Bereft of life, it rests in peace! If you hadn't nailed it to a
flagship device it'd be pushing up the daisies!
THIS IS AN EX-BUTTON!!
Change-Id: Id523ef8efa7d0fa7120f8430222ac892fcafefda
Igor Murashkin [Tue, 2 Jul 2013 18:23:44 +0000 (11:23 -0700)]
camera2 api: Add CameraMetadata get/set support
* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)
Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc
Bug:
9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
John Spurlock [Thu, 11 Jul 2013 19:30:13 +0000 (19:30 +0000)]
Merge "Resolve car dock home activities properly."
Baligh Uddin [Thu, 11 Jul 2013 18:55:30 +0000 (18:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Jul 2013 18:53:28 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Jul 2013 18:53:01 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE"
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.
Romain Guy [Thu, 11 Jul 2013 18:19:24 +0000 (18:19 +0000)]
Merge "Trace list view items management"
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
The Android Open Source Project [Thu, 11 Jul 2013 17:17:23 +0000 (10:17 -0700)]
am
8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
8f4e09d2a8213d64edacc081879aaadd56b961bc':
Elliott Hughes [Thu, 11 Jul 2013 17:17:12 +0000 (10:17 -0700)]
The Android Open Source Project [Thu, 11 Jul 2013 17:17:04 +0000 (10:17 -0700)]
am
f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
f51538f444ca9448d194cf184af4fd8f0554d723':
Revert "Stop marking gamepads as keyboards"
Revert "Temporarily disable 'Scan Always' mode"
Elliott Hughes [Thu, 11 Jul 2013 17:16:46 +0000 (10:16 -0700)]
am
dff4ec87: am
e16a21c6: resolved conflicts for merge of
4a59376d to stage-aosp-master
* commit '
dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
Track libcore API change.
Jean-Baptiste Queru [Thu, 11 Jul 2013 17:16:36 +0000 (10:16 -0700)]
Elliott Hughes [Thu, 11 Jul 2013 17:09:14 +0000 (17:09 +0000)]
Merge "Track libcore API update."
Scott Main [Thu, 11 Jul 2013 17:08:20 +0000 (10:08 -0700)]
am
df541931: 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 '
df541931f989d0421c38bea6bca7065bd7d4a292':
update url for backup service key bug:
8834302
Dirk Dougherty [Thu, 11 Jul 2013 17:08:17 +0000 (10:08 -0700)]
am
5fc1e8a3: 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 '
5fc1e8a33d816036a56abcee8eaefaeef2ea24e4':
docs: add link to developer survey on main landing pages
Elliott Hughes [Thu, 11 Jul 2013 17:06:35 +0000 (10:06 -0700)]
Track libcore API update.
Change-Id: I7ad4ee87008c2ba0f8f16d1c86d81b8114359e04
Marco Nelissen [Thu, 11 Jul 2013 16:30:26 +0000 (09:30 -0700)]
Add stopservice command to am
Change-Id: I639ad418750c0e1825b330b3bd56e5628926e7f1
Satoshi Kataoka [Thu, 11 Jul 2013 15:08:18 +0000 (08:08 -0700)]
am
7e0fad1d: am
8b95d259: am
b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
* commit '
7e0fad1d442428b9a2ba5d88ce7f8a59869acb0e':
Revert "Stop marking gamepads as keyboards"
Joe Malin [Thu, 11 Jul 2013 15:08:14 +0000 (08:08 -0700)]
am
fc13329b: am
216e340b: am
ea4193ef: am
46e8ca92: am
a4d3dedc: am
420b8212: am
a59eb93d: am
a6241377: Doc Bug:
b9739899 Bugs in Sync Adapters training
* commit '
fc13329b8430a62c02f7109e1b7cf0abcaa896ee':
Doc Bug:
b9739899 Bugs in Sync Adapters training
The Android Open Source Project [Thu, 11 Jul 2013 15:08:06 +0000 (08:08 -0700)]
am
b2bc3331: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
b2bc33315824ee880b319a2eb69018dc44d1026e':
John Spurlock [Tue, 9 Jul 2013 13:51:46 +0000 (09:51 -0400)]
Resolve car dock home activities properly.
Look up the actual user id (package manager does not understand
UserHandle.USER_CURRENT) and return metadata during resolution
for subsequent checking.
Bug:
9738229
Change-Id: Ib060bacc84473b27a1fb2e717651dc84f018d6f9
Ben Murdoch [Wed, 5 Jun 2013 13:19:48 +0000 (14:19 +0100)]
Plumb View.getAccessibilityNodeProvider though WebViewProvider.
This is needed to make use of the new Accessibility implementation
in the Chromium WebView. nos for WebView Classic.
Change-Id: I96bd2426d2de3b26dc9b72d0fdbacefa9bbe20f7
Lorenzo Colitti [Fri, 28 Jun 2013 08:26:21 +0000 (17:26 +0900)]
Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).
Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.
Bug:
9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
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
Dianne Hackborn [Thu, 11 Jul 2013 02:03:33 +0000 (02:03 +0000)]
Merge "Add -c option to meminfo to dump a compact form."
Dianne Hackborn [Thu, 11 Jul 2013 01:47:04 +0000 (18:47 -0700)]
Add -c option to meminfo to dump a compact form.
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.
Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
Baligh Uddin [Thu, 11 Jul 2013 01:41:54 +0000 (18:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3560b16b347b71c61ad1f723d444dbd056ee0d8f
Auto-generated-cl: translation import
Dirk Dougherty [Fri, 28 Jun 2013 21:04:39 +0000 (14:04 -0700)]
Doc change: Update gcore reference docs.
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
Baligh Uddin [Thu, 11 Jul 2013 01:24:25 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie5e451abf345a2dea6e4f970b24166f1ba7e205d
Auto-generated-cl: translation import
Baligh Uddin [Thu, 11 Jul 2013 01:08:48 +0000 (18:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f2d4b1f5d1ca4bb1f3c0e04757a627ad52ae365
Auto-generated-cl: translation import
Romain Guy [Wed, 10 Jul 2013 23:36:18 +0000 (16:36 -0700)]
Trace list view items management
Change-Id: If43ce115679c2bcacad26d6f59e3bfb655abff6e
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
Craig Mautner [Wed, 10 Jul 2013 21:52:28 +0000 (21:52 +0000)]
Merge "Add convertToTranslucent to API."
Chet Haase [Wed, 10 Jul 2013 20:00:15 +0000 (20:00 +0000)]
Merge "Fix minor transition bugs"
Kenny Root [Wed, 10 Jul 2013 19:35:49 +0000 (19:35 +0000)]
Merge "KeySetManager: convert comments to Javadoc"