Chris Wren
|
b606f59727
|
am ebf8af74: (-s ours) am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot"
* commit 'ebf8af7456171a2306e008afa636285dee3f4d07':
|
2013-12-05 22:38:24 +00:00 |
|
Ben Murdoch
|
ab90480550
|
am a866f6df: (-s ours) am cf67ae06: am 137e5a3b: Merge "Fix the build"
* commit 'a866f6df5e56c7a29bdceb723307bc96785358e2':
|
2013-12-05 22:38:19 +00:00 |
|
Chris Wren
|
1d81729e1d
|
am 87a4a466: (-s ours) am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification
* commit '87a4a46604ac8bc8259b5af358961f69e8924b92':
|
2013-12-05 22:38:13 +00:00 |
|
Chris Wren
|
4e15cb325f
|
am 7f5709bb: (-s ours) am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade."
* commit '7f5709bbd5c193a0d08e0ffeb2d924222bc565d6':
|
2013-12-05 22:38:08 +00:00 |
|
Chris Wren
|
903f69a9d3
|
am 6241ee27: (-s ours) am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized."
* commit '6241ee27cd33857f9144a86a074992648641de59':
|
2013-12-05 22:38:02 +00:00 |
|
Chris Wren
|
01b30911db
|
am 6709285a: (-s ours) am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."
* commit '6709285ab95c7e473ee451659c6c97484e96e136':
|
2013-12-05 22:37:57 +00:00 |
|
Matt Casey
|
6bda8f17d1
|
am 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"
* commit '96756e99e2f7e8d3e75aa405951b1538116c1c7a':
|
2013-12-05 22:37:52 +00:00 |
|
Martijn Coenen
|
33b8084320
|
am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."
* commit 'b35872f3a7622b168896c564136bf9e59ac9e96b':
|
2013-12-05 22:37:46 +00:00 |
|
Ying Wang
|
153dbe90bf
|
am 3cc887c5: (-s ours) am 265bbb56: am 610247fb: Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}."
* commit '3cc887c526f75f8ff09a6dd880427e719236cb7c':
|
2013-12-05 22:37:38 +00:00 |
|
Lorenzo Colitti
|
1017ecb27f
|
am 2316b2b3: (-s ours) am b9f16399: am a50f4b1d: Merge "Simplify LinkPropertiesTest."
* commit '2316b2b31611d762f9b6370ae8c6b17e238b8473':
|
2013-12-05 22:37:33 +00:00 |
|
Svetoslav Ganov
|
c2bd32783e
|
am 42bf3aaa: (-s ours) am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."
* commit '42bf3aaaa4a1b1c80bf190be5b89b84b2f5cbcd2':
|
2013-12-05 22:37:26 +00:00 |
|
Satoshi Kataoka
|
afc55064ae
|
am 96c5475f: (-s ours) am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList
* commit '96c5475f61e8a16622865ca3d629ac62e14f9203':
|
2013-12-05 22:37:19 +00:00 |
|
Jeff Sharkey
|
16d083da1d
|
am 83852c5f: (-s ours) am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."
* commit '83852c5ff44aef7c0dd1791d14294f443767926c':
|
2013-12-05 22:37:14 +00:00 |
|
Aravind Akella
|
0361e12c16
|
am 6904c5f0: (-s ours) am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."
* commit '6904c5f07a9a05d6174f1c2005f569a722d2fcc7':
|
2013-12-05 22:37:08 +00:00 |
|
Jeff Brown
|
c7aabc6224
|
am a2e33fba: (-s ours) am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."
* commit 'a2e33fbaec63f6f67cacea7816660b45d19414e6':
|
2013-12-05 22:37:01 +00:00 |
|
Jeff Brown
|
626fb9a7b4
|
am 30345f64: (-s ours) am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."
* commit '30345f64e8717c761f38fa1fd24378e2ac6805b3':
|
2013-12-05 22:36:54 +00:00 |
|
Jeff Brown
|
ed2f7bf4f5
|
am 8cfbb064: (-s ours) am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."
* commit '8cfbb064666d5a468d49badea125e8059afe0332':
|
2013-12-05 22:36:46 +00:00 |
|
Jason Monk
|
10bb8b4008
|
am 73f61c80: (-s ours) am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"
* commit '73f61c804c2430951c31c78dfbed9b2e4925a023':
|
2013-12-05 22:36:39 +00:00 |
|
Alan Viverette
|
1c9248a46a
|
am 2166b9b8: (-s ours) am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"
* commit '2166b9b89098db4043457e9ac5e353a073ac710d':
|
2013-12-05 22:36:34 +00:00 |
|
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 |
|