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 |
|
Baligh Uddin
|
d22f6a6296
|
am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '61c9706bac583a1cf95be12d7f5e96f652669d72':
|
2013-12-05 21:30:08 +00:00 |
|
Baligh Uddin
|
4830bc5084
|
am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'dc5f592c0344e9fc308c68d7d2e80b8b7f82acab':
|
2013-12-05 21:30:03 +00:00 |
|
Svetoslav Ganov
|
335289aae7
|
am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev
* commit '51843f8aa9a76207627288252a99f12141195a07':
|
2013-12-05 21:29:54 +00:00 |
|
Jose Lima
|
758485f003
|
am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev
* commit '0d27bc294610d7415093804a20d380f2e78bd30b':
|
2013-12-05 21:29:40 +00:00 |
|
David Christie
|
e4fdda2793
|
am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network prov
* commit '8810a0c3c242ab0ac252261d7f73258769cc9f2d':
|
2013-12-05 21:29:25 +00:00 |
|
Kristian Monsen
|
44e0da4ebc
|
am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev
* commit 'c319ddd9ec9c630840a11765a4630b1375fe9664':
|
2013-12-05 21:29:16 +00:00 |
|
Vinit Deshapnde
|
ba690f48b9
|
am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev
* commit 'f76c1685a55302e95086818b5178d9af257b3e4f':
|
2013-12-05 21:29:03 +00:00 |
|
keunyoung
|
44894df5d7
|
am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev
* commit '72d29c2d0d062122710e4d3d4eed68f04be3b275':
|
2013-12-05 21:28:57 +00:00 |
|
Michael Wright
|
054a7f5cba
|
am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev
* commit 'aad62128100f0c1562f9c61a721b703480ed3772':
|
2013-12-05 21:28:41 +00:00 |
|
Victoria Lease
|
5126f194c0
|
am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev
* commit '4b982e49751c87bc4d55c3ab59958904ad9f701b':
|
2013-12-05 21:28:16 +00:00 |
|
Romain Guy
|
1668ebf484
|
am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev
* commit '76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02':
|
2013-12-05 21:27:56 +00:00 |
|
Alan Viverette
|
f5a89a2bb3
|
am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev
* commit '1e68ffc72fda060b316f0cf6d2a310a601965577':
|
2013-12-05 21:27:48 +00:00 |
|
Svetoslav
|
ae2b398150
|
am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev
* commit 'beb7b44962b7dfd2a9d4cc56ec6417037ffff862':
|
2013-12-05 21:27:39 +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 |
|
The Android Open Source Project
|
ebcb32f58a
|
Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
|
2013-12-05 13:10:46 -08: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 |
|
Chet Haase
|
a004f72cf0
|
am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev
* commit '54276ad3dabc9c1ccafb67b621a8d0f3960820c9':
|
2013-12-05 19:47:27 +00:00 |
|
Craig Mautner
|
7a9ec2cd8d
|
am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev
* commit 'afa1231e75f8808f17eccdef51bce98100364521':
|
2013-12-05 19:47:14 +00:00 |
|
Katie McCormick
|
6acc2743ee
|
am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'dfa36da5ca9b614a0ad5e69b008920e64c0d8356':
|
2013-12-05 19:47:06 +00:00 |
|
Selim Gurun
|
aff9c48759
|
am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev
* commit 'ff1b3f0789f014b4ce7e2cd47c4d47e3f70fe484':
|
2013-12-05 19:46:51 +00:00 |
|
Romain Guy
|
9b7bf2ba1e
|
am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev
* commit '98e50c50f52b045d944df2eee0987d06eb1af07d':
|
2013-12-05 19:46:34 +00:00 |
|
Scott Main
|
d7889768b1
|
am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."
* commit '07b9b3ad3b4d942b4ed920cfa8f68bce71686972':
|
2013-12-05 19:46:20 +00:00 |
|