Scott Main
|
61c5f66d98
|
am fd1a17f7: (-s ours) am 37d77b19: am 55db1e12: am ef54f611: am bdf85de3: am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
* commit 'fd1a17f7384be56a28360cc6cf63bb76001bcad7':
|
2013-12-05 22:36:28 +00:00 |
|
Ben Gruver
|
ab18470f8c
|
am 8494a6e3: (-s ours) am 1883de04: am 49660c7c: Add support for broadcast intents
* commit '8494a6e311a27cd4447fc64c2c83b4e135e9530e':
|
2013-12-05 22:36:23 +00:00 |
|
Ben Gruver
|
2e957e33d3
|
am 4196d956: (-s ours) am 7bd12d5d: am f157b48e: Add support for matching explicit intents
* commit '4196d956a786af7d85582c435086c69720cc0743':
|
2013-12-05 22:36:16 +00:00 |
|
Ben Gruver
|
4816a1e22c
|
am 46389b40: (-s ours) am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents
* commit '46389b40f187e69bac16fd8f170e0c1113bcf279':
|
2013-12-05 22:36:10 +00:00 |
|
Ben Gruver
|
40158a2e5c
|
am 73a3c9af: (-s ours) am 3632f945: am b6223793: Add support for service intents
* commit '73a3c9afac74f296ca755bde098b5c85b703aaa5':
|
2013-12-05 22:36:05 +00:00 |
|
Ben Gruver
|
61e5b87dd4
|
am fb0e580f: (-s ours) am eef10af9: am e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"
* commit 'fb0e580f45c1b710261f821390a1c30555e4f255':
|
2013-12-05 22:35:56 +00:00 |
|
Jeff Sharkey
|
61dea422fa
|
am 94fb9df8: (-s ours) am 9a1237b5: am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks."
* commit '94fb9df89c11ab8ebea71015671c835389c148c3':
|
2013-12-05 22:35:49 +00:00 |
|
Romain Guy
|
b6635e99c7
|
am 4cabae71: (-s ours) am f56bbcc5: am 0b451b3a: Merge "Only destroy remote graphic buffers Bug #9795157"
* commit '4cabae71fec87bb290e9316d14195799ab078a9c':
|
2013-12-05 22:35:43 +00:00 |
|
Alan Viverette
|
49676f88a7
|
am b85e17f6: (-s ours) am df29cde3: am d53e376c: Merge "Fix FastScroller regression for non-UI threads"
* commit 'b85e17f6ecaac257904a59f7e0d3e8cab5055e1b':
|
2013-12-05 22:35:38 +00:00 |
|
Victoria Lease
|
3624269807
|
am 0c200c67: (-s ours) am f7a7766e: am 250d3c27: Merge "prototype colour emoji font"
* commit '0c200c67c5108e2dc452d1839fb265e7d7a08309':
|
2013-12-05 22:35:33 +00:00 |
|
David Christie
|
626d6262c0
|
am bb9c2278: (-s ours) am dd28b07c: am eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"
* commit 'bb9c2278efc7377a9cb7e581f72ed5fa5b2d5e2c':
|
2013-12-05 22:35:28 +00:00 |
|
Jeff Brown
|
68cf8bfa79
|
am 00ffaf3f: (-s ours) am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."
* commit '00ffaf3fcb5c4fec8e6c4b6c137450c2439383aa':
|
2013-12-05 22:35:22 +00:00 |
|
Mathias Agopian
|
2b00df255d
|
am 260290ab: (-s ours) am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"
* commit '260290ab633c54d02a6cc32f1efb8087b4434013':
|
2013-12-05 22:35:17 +00:00 |
|
Alan Viverette
|
cab6d87a16
|
am 37914bb0: (-s ours) am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
* commit '37914bb0ce096b8cb5c5c60ce1362467ebe22bf8':
|
2013-12-05 22:35:11 +00:00 |
|
Dirk Dougherty
|
5ddaadeb40
|
am ea55d02b: (-s ours) am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
* commit 'ea55d02b59ab8d6e5319946d6aafb268c346cee9':
|
2013-12-05 22:35:06 +00:00 |
|
Alan Viverette
|
5f6ae10b8c
|
am a2180eba: (-s ours) am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
* commit 'a2180eba3adf5d3ad5c3f48a583d0035173a5c1a':
|
2013-12-05 22:34:54 +00:00 |
|
Todd Poynor
|
366bb6e072
|
am ba813d05: (-s ours) am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data
* commit 'ba813d059cd75f1376787afe477e18bff7593652':
|
2013-12-05 22:34:48 +00:00 |
|
Craig Mautner
|
fb2cd2d78c
|
am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."
* commit 'cf698844634fd2dfd335ece8f907abb8de5fc414':
|
2013-12-05 22:34:42 +00:00 |
|
Amith Yamasani
|
d081c81fc4
|
am 4500fb33: (-s ours) am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps"
* commit '4500fb330c85ce9accc7d7ea3c97a09d31e85356':
|
2013-12-05 22:34:36 +00:00 |
|
Brian Williammee
|
3b3152398d
|
am 1c396eb7: (-s ours) am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks"
* commit '1c396eb73c6572708b437643dd4ebeee54cb8d2b':
|
2013-12-05 22:34:31 +00:00 |
|
Glenn Kasten
|
83c3dc0a39
|
am fa7e5d9e: (-s ours) am 2021fba4: am d8405261: Merge "Update audio comments"
* commit 'fa7e5d9eb2d6e053b5799562dc1c6c2183846cf4':
|
2013-12-05 22:34:24 +00:00 |
|
Dianne Hackborn
|
2dfb990dfe
|
am 12f766d0: (-s ours) am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."
* commit '12f766d033d71d109bf51e6bb66f53018ed81d1c':
|
2013-12-05 22:34:13 +00:00 |
|
Baligh Uddin
|
688697c747
|
am 37a46250: (-s ours) am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '37a4625058d86f315fa3e9c1de9e309103fa4149':
|
2013-12-05 22:34:07 +00:00 |
|
Baligh Uddin
|
be55f4ec8e
|
am d7f04345: (-s ours) am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'd7f043459d2132a14495fd069c9539826b792792':
|
2013-12-05 22:34:02 +00:00 |
|
Craig Mautner
|
6f1cdb4a14
|
am 86ac3aab: (-s ours) Merge "Eliminate StackBox." into klp-modular-dev
* commit '86ac3aab40ce6896f5518a9d84b9aadd0fd52b18':
Eliminate StackBox.
|
2013-12-05 22:33:56 +00:00 |
|
Amith Yamasani
|
79fa35cd03
|
am 3b84092f: (-s ours) DO NOT MERGE : Move some system services to their own sub package.
* commit '3b84092f878f3d3b42c771968459de4a02eecce3':
DO NOT MERGE : Move some system services to their own sub package.
|
2013-12-05 22:33:49 +00:00 |
|
Amith Yamasani
|
b60c1e345c
|
am bf2c4b78: (-s ours) DO NOT MERGE: Don\'t freak out if SystemUiService isn\'t available
* commit 'bf2c4b788078cf2a2eda0e9f420f4d6225a0774d':
DO NOT MERGE: Don't freak out if SystemUiService isn't available
|
2013-12-05 22:33:43 +00:00 |
|
Mike Lockwood
|
afac09baac
|
am a34f0cd9: (-s ours) DO NOT MERGE: Remove obsolete "headless" support
* commit 'a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1':
DO NOT MERGE: Remove obsolete "headless" support
|
2013-12-05 22:33:37 +00:00 |
|
Ying Wang
|
41f75016ac
|
am 7a15f932: am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '7a15f93228b455a731946d4894abdc45be8b164b':
wifi: Remove obsolete libwpa_client library
|
2013-12-05 21:17:08 +00:00 |
|
Ying Wang
|
7a15f93228
|
am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
wifi: Remove obsolete libwpa_client library
|
2013-12-05 20:33:43 +00:00 |
|
Ying Wang
|
babea8d8f2
|
am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
wifi: Remove obsolete libwpa_client library
|
2013-12-05 12:29:12 -08:00 |
|
Fabrice Di Meglio
|
6317f13e41
|
am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit 'b945d80c9bb91b90e48add2a4f665de02c63e28c':
|
2013-12-05 19:38:27 +00:00 |
|
Elliott Hughes
|
d7f6aff954
|
am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."
* commit '795a7decc2e9e547e0cf6291567d427a2a60517a':
Remove possible leak when exception occurred.
|
2013-12-05 19:38:19 +00:00 |
|
Mathias Agopian
|
0a12834894
|
am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
* commit '2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46':
|
2013-12-05 19:38:09 +00:00 |
|
Romain Guy
|
8df8225d8d
|
am ac322988: am 00312300: Remove an unnecessary allocation
* commit 'ac322988339d98665eff9f5937caff9a4eadd9d2':
|
2013-12-05 19:38:03 +00:00 |
|
Jeff Sharkey
|
082c81545b
|
am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev
* commit '1faca4cd10eaff01a575288e8484a72be66f148f':
|
2013-12-05 19:37:44 +00:00 |
|
Svetoslav
|
0785ccc2cc
|
am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
* commit '85dbba82dffd68867623ab7e881f8adb55ff0428':
|
2013-12-05 19:37:27 +00:00 |
|
Jeff Sharkey
|
bb76afa9bc
|
am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
|
2013-12-05 19:37:20 +00:00 |
|
Jonathan Dixon
|
177b89e911
|
am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
|
2013-12-05 19:37:12 +00:00 |
|
Wink Saville
|
f3aca5f7ca
|
am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '8418a309a3e228538a2cf921f386326a9afe394b':
|
2013-12-05 19:36:33 +00:00 |
|
Wink Saville
|
47dc5a34b9
|
am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
|
2013-12-05 19:36:10 +00:00 |
|
Wink Saville
|
1535714401
|
am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
|
2013-12-05 19:35:35 +00:00 |
|
Jeff Brown
|
cc951f1289
|
am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
|
2013-12-05 19:35:27 +00:00 |
|
Wink Saville
|
027b0651eb
|
am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '1a5c94fc65038c72045a5cf5509f2cf152c6c406':
|
2013-12-05 19:35:18 +00:00 |
|
Joe Malin
|
ede85d2a9d
|
am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit '6023b8289d030e8bf88be33c5f04d298748bd6f4':
|
2013-12-05 19:35:10 +00:00 |
|
Dianne Hackborn
|
bfdb10d273
|
am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings...
* commit 'db7b8e210d97548b8ed21b6453e1e4100b23a07f':
|
2013-12-05 19:35:03 +00:00 |
|
destradaa
|
89424f35f7
|
am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev
* commit 'b4430c5c265a9456356aca71792d5d113f2454ab':
|
2013-12-05 19:33:23 +00:00 |
|
Dianne Hackborn
|
542ff71acf
|
am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes.
* commit '30d4de76b1ad224bd41c7581b5beb4ace2020398':
|
2013-12-05 19:33:14 +00:00 |
|
David Christie
|
7f6e1affc2
|
am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev
* commit '262f3ff288d7da3be8db4c38200e5501e87a3445':
|
2013-12-05 19:32:59 +00:00 |
|
Vinit Deshapnde
|
f3eb44f2bd
|
am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
|
2013-12-05 19:32:41 +00:00 |
|