keunyoung
a446bf0e8c
add TYPE_PRIVATE_PRESENTATION window type
...
- This window type can be used for Presentation created on top of virtual
private display.
- There can be PRIVATE_PRESENTATION specific policy / behavior, but for now,
there is nothing special.
Change-Id: I9fde0f0376e57fcc60000d3a3f8657a21ef58993
2013-07-12 14:41:10 -07:00
Marco Nelissen
cda564d6ea
Merge "Add stopservice command to am"
2013-07-12 14:34:41 +00:00
The Android Open Source Project
b2d93f85b6
am a4ee3088: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'a4ee3088e74bb9b38dcd469df4dc929f1c935ff3':
Recover from corrupt network stats.
2013-07-12 07:30:00 -07:00
The Android Open Source Project
a4ee3088e7
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
2013-07-12 07:27:43 -07:00
Lorenzo Colitti
51a845688c
Merge "Make legacy VPN work over stacked interfaces."
2013-07-12 03:33:20 +00:00
Elliott Hughes
bea6525a53
am 9c8685b7: am f094eefc: am c5de9c35: Merge "Track libcore API update."
...
* commit '9c8685b714b38c2bbf09077b9cba73a95b734269':
Track libcore API update.
2013-07-11 19:01:40 -07:00
Elliott Hughes
9c8685b714
am f094eefc: am c5de9c35: Merge "Track libcore API update."
...
* commit 'f094eefc34013c7167effa558b488709eaa54751':
Track libcore API update.
2013-07-11 18:55:54 -07:00
Elliott Hughes
f094eefc34
am c5de9c35: Merge "Track libcore API update."
...
* commit 'c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
Track libcore API update.
2013-07-11 18:52:11 -07:00
Scott Main
86b4bfbdfe
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
2013-07-11 18:16:37 -07:00
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
Dirk Dougherty
29d0833f74
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.
2013-07-11 18:09:59 -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
Vinit Deshapnde
e088428400
Merge "Allow enabling TDLS on specific routes"
2013-07-12 00:58:07 +00: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
171699fbdd
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
2013-07-11 17:48:00 -07: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
Romain Guy
6b217a4d2a
Merge "Trace bitmaps decoding"
2013-07-12 00:41:24 +00: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
Romain Guy
787e35793f
Trace bitmaps decoding
...
Also remove dead code
Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
2013-07-11 17:37: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
Jeff Sharkey
2248ff32ba
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 17:22:41 -07:00
Robert Greenwalt
d76a6851a8
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.
2013-07-11 17:12:35 -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
dd893b9db3
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
2013-07-11 16:53:19 -07: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
Adam Powell
639f37e7ab
Merge "Un-hide all ViewParent methods"
2013-07-11 22:50:38 +00:00
Adam Powell
504a10f2f5
Un-hide all ViewParent methods
...
Make it possible for code outside the framework to implement the
ViewParent interface.
Change-Id: Ic1b4eb15a4b3da1d16c92b59e039d89861d893e4
2013-07-11 15:25:59 -07:00
Geremy Condra
1df62d2783
Merge "Permissions to protect socket marking settings"
2013-07-11 22:25:14 +00:00
Igor Murashkin
aec59fa0c8
Merge "camera2 api: Add CameraMetadata get/set support"
2013-07-11 22:17:38 +00:00
