git.osdn.net Git - android-x86/frameworks-base.git/log

Svetoslav Ganov [Thu, 5 Dec 2013 22:59:51 +0000 (14:59 -0800)]

am c2bd3278: am 42bf3aaa: (-s ours) am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."

* commit 'c2bd32783eb7e11b945aece470004a29b760a16f':

commit | commitdiff | tree

Satoshi Kataoka [Thu, 5 Dec 2013 22:59:48 +0000 (14:59 -0800)]

am afc55064: am 96c5475f: (-s ours) am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList

* commit 'afc55064ae028330c989c988838ade8b0630e58c':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 22:59:45 +0000 (14:59 -0800)]

am 16d083da: am 83852c5f: (-s ours) am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."

* commit '16d083da1da13e83e8b91842569d81f1367669b2':

commit | commitdiff | tree

Aravind Akella [Thu, 5 Dec 2013 22:59:42 +0000 (14:59 -0800)]

am 0361e12c: am 6904c5f0: (-s ours) am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."

* commit '0361e12c16060f44cbef7d2fd592784cd3786cbe':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:59:38 +0000 (14:59 -0800)]

am c7aabc62: am a2e33fba: (-s ours) am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."

* commit 'c7aabc62243d66d0a316707cfcf116dc468e9e4b':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:59:35 +0000 (14:59 -0800)]

am 626fb9a7: am 30345f64: (-s ours) am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."

* commit '626fb9a7b4ca7d7395b9ddb437ed276ac76c019f':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:59:32 +0000 (14:59 -0800)]

am ed2f7bf4: am 8cfbb064: (-s ours) am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."

* commit 'ed2f7bf4f54e4869e04acfd350b2b8867237db22':

commit | commitdiff | tree

Jason Monk [Thu, 5 Dec 2013 22:59:29 +0000 (14:59 -0800)]

am 10bb8b40: am 73f61c80: (-s ours) am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"

* commit '10bb8b40087822230a50cb8cfae64282b8ff7ae1':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:59:26 +0000 (14:59 -0800)]

am 1c9248a4: am 2166b9b8: (-s ours) am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"

* commit '1c9248a46acd9c57bf3095827d4404ba75445f75':

commit | commitdiff | tree

Scott Main [Thu, 5 Dec 2013 22:59:22 +0000 (14:59 -0800)]

am 61c5f66d: 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 '61c5f66d980d5abb51d83e0f62ece5714b16d263':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:59:19 +0000 (14:59 -0800)]

am ab18470f: am 8494a6e3: (-s ours) am 1883de04: am 49660c7c: Add support for broadcast intents

* commit 'ab18470f8c9ddf8a456df0e7068fe8711aa6c255':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:59:15 +0000 (14:59 -0800)]

am 2e957e33: am 4196d956: (-s ours) am 7bd12d5d: am f157b48e: Add support for matching explicit intents

* commit '2e957e33d3354c6d2395d24a3e99aade287d5614':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:59:12 +0000 (14:59 -0800)]

am 4816a1e2: am 46389b40: (-s ours) am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents

* commit '4816a1e22c1429e752a8173ed3cc9bd6acbccb80':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:59:10 +0000 (14:59 -0800)]

am 40158a2e: am 73a3c9af: (-s ours) am 3632f945: am b6223793: Add support for service intents

* commit '40158a2e5c68822a17fc2cb14e4e49942487f0f7':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:59:06 +0000 (14:59 -0800)]

am 61e5b87d: am fb0e580f: (-s ours) am eef10af9: am e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"

* commit '61e5b87dd4e5aa4177df577c5231da0479d1c959':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 22:59:02 +0000 (14:59 -0800)]

am 61dea422: am 94fb9df8: (-s ours) am 9a1237b5: am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks."

* commit '61dea422faf1c3e026dd45b965c4adb7cab4cf89':

commit | commitdiff | tree

Romain Guy [Thu, 5 Dec 2013 22:58:59 +0000 (14:58 -0800)]

am b6635e99: am 4cabae71: (-s ours) am f56bbcc5: am 0b451b3a: Merge "Only destroy remote graphic buffers Bug #9795157"

* commit 'b6635e99c71d07dc9daa1020c75bddb5da965aba':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:58:55 +0000 (14:58 -0800)]

am 49676f88: am b85e17f6: (-s ours) am df29cde3: am d53e376c: Merge "Fix FastScroller regression for non-UI threads"

* commit '49676f88a70172b1a56a5f6894f31c056ae6b038':

commit | commitdiff | tree

Victoria Lease [Thu, 5 Dec 2013 22:58:52 +0000 (14:58 -0800)]

am 36242698: am 0c200c67: (-s ours) am f7a7766e: am 250d3c27: Merge "prototype colour emoji font"

* commit '36242698071af83bf59c3f02f7bf43556bf58373':

commit | commitdiff | tree

David Christie [Thu, 5 Dec 2013 22:58:49 +0000 (14:58 -0800)]

am 626d6262: am bb9c2278: (-s ours) am dd28b07c: am eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"

* commit '626d6262c027e05c1f90d08fc7c6139507f13e59':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:58:46 +0000 (14:58 -0800)]

am 68cf8bfa: am 00ffaf3f: (-s ours) am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."

* commit '68cf8bfa79c4178259a5ae885020a9d0b1cb3181':

commit | commitdiff | tree

Mathias Agopian [Thu, 5 Dec 2013 22:58:28 +0000 (14:58 -0800)]

am 2b00df25: am 260290ab: (-s ours) am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"

* commit '2b00df255d1227ce2b6ea5f53b8bc98fb348075b':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:58:25 +0000 (14:58 -0800)]

am cab6d87a: am 37914bb0: (-s ours) am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"

* commit 'cab6d87a165fc3a69b92a28b0f5e8d031e5863b5':

commit | commitdiff | tree

Dirk Dougherty [Thu, 5 Dec 2013 22:58:22 +0000 (14:58 -0800)]

am 5ddaadeb: am ea55d02b: (-s ours) am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.

* commit '5ddaadeb40c829477524fa878f97b125b99320ca':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:58:18 +0000 (14:58 -0800)]

am 5f6ae10b: am a2180eba: (-s ours) am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"

* commit '5f6ae10b8c3f1342211ca4b090369dd7f8fd6c3d':

commit | commitdiff | tree

Todd Poynor [Thu, 5 Dec 2013 22:58:14 +0000 (14:58 -0800)]

am 366bb6e0: am ba813d05: (-s ours) am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data

* commit '366bb6e072b299257045dd8db3f97a1b490f7670':

commit | commitdiff | tree

Craig Mautner [Thu, 5 Dec 2013 22:58:09 +0000 (14:58 -0800)]

am fb2cd2d7: am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."

* commit 'fb2cd2d78c25532d5e63999a84fc082f2326c85d':

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:58:04 +0000 (14:58 -0800)]

am d081c81f: am 4500fb33: (-s ours) am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps"

* commit 'd081c81fc404066f35c1877faa9c6dbcac8a734e':

commit | commitdiff | tree

Brian Williammee [Thu, 5 Dec 2013 22:58:01 +0000 (14:58 -0800)]

am 3b315239: am 1c396eb7: (-s ours) am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks"

* commit '3b3152398d3bc2e60e2c1a5849e436f8087e0ce6':

commit | commitdiff | tree

Glenn Kasten [Thu, 5 Dec 2013 22:57:58 +0000 (14:57 -0800)]

am 83c3dc0a: am fa7e5d9e: (-s ours) am 2021fba4: am d8405261: Merge "Update audio comments"

* commit '83c3dc0a391c45068803a5925b70e90b55b82d77':

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Dec 2013 22:57:52 +0000 (14:57 -0800)]

am 2dfb990d: am 12f766d0: (-s ours) am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."

* commit '2dfb990dfe514beb9ae7dd3a2509fad09a43314d':

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Dec 2013 22:57:46 +0000 (14:57 -0800)]

am 688697c7: (-s ours) am 37a46250: (-s ours) am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '688697c747a8e53e6620f77f0064070150d15084':

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Dec 2013 22:57:43 +0000 (14:57 -0800)]

am be55f4ec: (-s ours) am d7f04345: (-s ours) am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'be55f4ec8e413b201428ac984d893d7349cacced':

commit | commitdiff | tree

Craig Mautner [Thu, 5 Dec 2013 22:57:40 +0000 (14:57 -0800)]

am 6f1cdb4a: am 86ac3aab: (-s ours) Merge "Eliminate StackBox." into klp-modular-dev

* commit '6f1cdb4a141e4c4173293332611992fc20cb185c':
Eliminate StackBox.

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:57:37 +0000 (14:57 -0800)]

am 79fa35cd: am 3b84092f: (-s ours) DO NOT MERGE : Move some system services to their own sub package.

* commit '79fa35cd037596697be35e7a85975a69ad6c977c':
DO NOT MERGE : Move some system services to their own sub package.

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:57:34 +0000 (14:57 -0800)]

am b60c1e34: am bf2c4b78: (-s ours) DO NOT MERGE: Don\'t freak out if SystemUiService isn\'t available

* commit 'b60c1e345c5f19caa11b2d816462ee794625ebea':
DO NOT MERGE: Don't freak out if SystemUiService isn't available

commit | commitdiff | tree

Mike Lockwood [Thu, 5 Dec 2013 22:57:29 +0000 (14:57 -0800)]

am afac09ba: am a34f0cd9: (-s ours) DO NOT MERGE: Remove obsolete "headless" support

* commit 'afac09baace089a0c7403c29b1dfd2f8c6416aff':
DO NOT MERGE: Remove obsolete "headless" support

commit | commitdiff | tree

Svetoslav Ganov [Thu, 5 Dec 2013 22:37:26 +0000 (22:37 +0000)]

am 42bf3aaa: (-s ours) am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."

* commit '42bf3aaaa4a1b1c80bf190be5b89b84b2f5cbcd2':

commit | commitdiff | tree

Satoshi Kataoka [Thu, 5 Dec 2013 22:37:19 +0000 (22:37 +0000)]

am 96c5475f: (-s ours) am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList

* commit '96c5475f61e8a16622865ca3d629ac62e14f9203':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 22:37:14 +0000 (22:37 +0000)]

am 83852c5f: (-s ours) am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."

* commit '83852c5ff44aef7c0dd1791d14294f443767926c':

commit | commitdiff | tree

Aravind Akella [Thu, 5 Dec 2013 22:37:08 +0000 (22:37 +0000)]

am 6904c5f0: (-s ours) am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."

* commit '6904c5f07a9a05d6174f1c2005f569a722d2fcc7':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:37:01 +0000 (22:37 +0000)]

am a2e33fba: (-s ours) am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."

* commit 'a2e33fbaec63f6f67cacea7816660b45d19414e6':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:36:54 +0000 (22:36 +0000)]

am 30345f64: (-s ours) am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."

* commit '30345f64e8717c761f38fa1fd24378e2ac6805b3':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:36:46 +0000 (22:36 +0000)]

am 8cfbb064: (-s ours) am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."

* commit '8cfbb064666d5a468d49badea125e8059afe0332':

commit | commitdiff | tree

Jason Monk [Thu, 5 Dec 2013 22:36:39 +0000 (22:36 +0000)]

am 73f61c80: (-s ours) am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"

* commit '73f61c804c2430951c31c78dfbed9b2e4925a023':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:36:34 +0000 (22:36 +0000)]

am 2166b9b8: (-s ours) am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"

* commit '2166b9b89098db4043457e9ac5e353a073ac710d':

commit | commitdiff | tree

Scott Main [Thu, 5 Dec 2013 22:36:28 +0000 (22:36 +0000)]

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':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:36:23 +0000 (22:36 +0000)]

am 8494a6e3: (-s ours) am 1883de04: am 49660c7c: Add support for broadcast intents

* commit '8494a6e311a27cd4447fc64c2c83b4e135e9530e':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:36:16 +0000 (22:36 +0000)]

am 4196d956: (-s ours) am 7bd12d5d: am f157b48e: Add support for matching explicit intents

* commit '4196d956a786af7d85582c435086c69720cc0743':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:36:10 +0000 (22:36 +0000)]

am 46389b40: (-s ours) am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents

* commit '46389b40f187e69bac16fd8f170e0c1113bcf279':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:36:05 +0000 (22:36 +0000)]

am 73a3c9af: (-s ours) am 3632f945: am b6223793: Add support for service intents

* commit '73a3c9afac74f296ca755bde098b5c85b703aaa5':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 22:35:56 +0000 (22:35 +0000)]

am fb0e580f: (-s ours) am eef10af9: am e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"

* commit 'fb0e580f45c1b710261f821390a1c30555e4f255':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 22:35:49 +0000 (22:35 +0000)]

am 94fb9df8: (-s ours) am 9a1237b5: am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks."

* commit '94fb9df89c11ab8ebea71015671c835389c148c3':

commit | commitdiff | tree

Romain Guy [Thu, 5 Dec 2013 22:35:43 +0000 (22:35 +0000)]

am 4cabae71: (-s ours) am f56bbcc5: am 0b451b3a: Merge "Only destroy remote graphic buffers Bug #9795157"

* commit '4cabae71fec87bb290e9316d14195799ab078a9c':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:35:38 +0000 (22:35 +0000)]

am b85e17f6: (-s ours) am df29cde3: am d53e376c: Merge "Fix FastScroller regression for non-UI threads"

* commit 'b85e17f6ecaac257904a59f7e0d3e8cab5055e1b':

commit | commitdiff | tree

Victoria Lease [Thu, 5 Dec 2013 22:35:33 +0000 (22:35 +0000)]

am 0c200c67: (-s ours) am f7a7766e: am 250d3c27: Merge "prototype colour emoji font"

* commit '0c200c67c5108e2dc452d1839fb265e7d7a08309':

commit | commitdiff | tree

David Christie [Thu, 5 Dec 2013 22:35:28 +0000 (22:35 +0000)]

am bb9c2278: (-s ours) am dd28b07c: am eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"

* commit 'bb9c2278efc7377a9cb7e581f72ed5fa5b2d5e2c':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 22:35:22 +0000 (22:35 +0000)]

am 00ffaf3f: (-s ours) am 96d5cd8f: am 18ec40c4: Merge "Destroy surfaces when display is removed."

* commit '00ffaf3fcb5c4fec8e6c4b6c137450c2439383aa':

commit | commitdiff | tree

Mathias Agopian [Thu, 5 Dec 2013 22:35:17 +0000 (22:35 +0000)]

am 260290ab: (-s ours) am 6ed79d6e: am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"

* commit '260290ab633c54d02a6cc32f1efb8087b4434013':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:35:11 +0000 (22:35 +0000)]

am 37914bb0: (-s ours) am a9b6a30f: am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"

* commit '37914bb0ce096b8cb5c5c60ce1362467ebe22bf8':

commit | commitdiff | tree

Dirk Dougherty [Thu, 5 Dec 2013 22:35:06 +0000 (22:35 +0000)]

am ea55d02b: (-s ours) am d76ca645: am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.

* commit 'ea55d02b59ab8d6e5319946d6aafb268c346cee9':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 22:34:54 +0000 (22:34 +0000)]

am a2180eba: (-s ours) am 13bcfdca: am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"

* commit 'a2180eba3adf5d3ad5c3f48a583d0035173a5c1a':

commit | commitdiff | tree

Todd Poynor [Thu, 5 Dec 2013 22:34:48 +0000 (22:34 +0000)]

am ba813d05: (-s ours) am d159dc7c: am df89ca33: batteryservice: add battery current now and charge counter data

* commit 'ba813d059cd75f1376787afe477e18bff7593652':

commit | commitdiff | tree

Craig Mautner [Thu, 5 Dec 2013 22:34:42 +0000 (22:34 +0000)]

am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."

* commit 'cf698844634fd2dfd335ece8f907abb8de5fc414':

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:34:36 +0000 (22:34 +0000)]

am 4500fb33: (-s ours) am 1a18832c: am d8e97493: Merge "Try again to cleanup all blocked apps"

* commit '4500fb330c85ce9accc7d7ea3c97a09d31e85356':

commit | commitdiff | tree

Brian Williammee [Thu, 5 Dec 2013 22:34:31 +0000 (22:34 +0000)]

am 1c396eb7: (-s ours) am 58b6d489: am e2b1b8e2: Merge "Track latency of captive portal checks"

* commit '1c396eb73c6572708b437643dd4ebeee54cb8d2b':

commit | commitdiff | tree

Glenn Kasten [Thu, 5 Dec 2013 22:34:24 +0000 (22:34 +0000)]

am fa7e5d9e: (-s ours) am 2021fba4: am d8405261: Merge "Update audio comments"

* commit 'fa7e5d9eb2d6e053b5799562dc1c6c2183846cf4':

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Dec 2013 22:34:13 +0000 (22:34 +0000)]

am 12f766d0: (-s ours) am 978efc21: am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."

* commit '12f766d033d71d109bf51e6bb66f53018ed81d1c':

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Dec 2013 22:34:07 +0000 (22:34 +0000)]

am 37a46250: (-s ours) am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '37a4625058d86f315fa3e9c1de9e309103fa4149':

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Dec 2013 22:34:02 +0000 (22:34 +0000)]

am d7f04345: (-s ours) am 45f2a494: (-s ours) am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'd7f043459d2132a14495fd069c9539826b792792':

commit | commitdiff | tree

Craig Mautner [Thu, 5 Dec 2013 22:33:56 +0000 (22:33 +0000)]

am 86ac3aab: (-s ours) Merge "Eliminate StackBox." into klp-modular-dev

* commit '86ac3aab40ce6896f5518a9d84b9aadd0fd52b18':
Eliminate StackBox.

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:33:49 +0000 (22:33 +0000)]

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.

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 22:33:43 +0000 (22:33 +0000)]

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

commit | commitdiff | tree

Mike Lockwood [Thu, 5 Dec 2013 22:33:37 +0000 (22:33 +0000)]

am a34f0cd9: (-s ours) DO NOT MERGE: Remove obsolete "headless" support

* commit 'a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1':
DO NOT MERGE: Remove obsolete "headless" support

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 21:19:54 +0000 (13:19 -0800)]

am 41f75016: am 7a15f932: am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit '41f75016acb23303929b42a8abb50fbb8e394564':
wifi: Remove obsolete libwpa_client library

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 21:17:08 +0000 (21:17 +0000)]

am 7a15f932: am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit '7a15f93228b455a731946d4894abdc45be8b164b':
wifi: Remove obsolete libwpa_client library

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 20:33:43 +0000 (20:33 +0000)]

am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
wifi: Remove obsolete libwpa_client library

commit | commitdiff | tree

Ying Wang [Thu, 5 Dec 2013 20:29:12 +0000 (12:29 -0800)]

am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
wifi: Remove obsolete libwpa_client library

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 20:26:38 +0000 (12:26 -0800)]

am ad7d65da: Merge "Add stacked padding mode to LayerDrawable"

* commit 'ad7d65daed314adc4e51c206e42e4062a3e4ab20':
Add stacked padding mode to LayerDrawable

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 20:26:34 +0000 (12:26 -0800)]

am a812ab87: Merge "Allow alert dialogs to inflate custom view layouts"

* commit 'a812ab8786444b6cb3e1169a3f8b3959fb295e61':
Allow alert dialogs to inflate custom view layouts

commit | commitdiff | tree

Svetoslav Ganov [Thu, 5 Dec 2013 19:29:17 +0000 (19:29 +0000)]

am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."

* commit 'c8916c9d05128bcae6978af4304071a30af11a89':

commit | commitdiff | tree

Satoshi Kataoka [Thu, 5 Dec 2013 19:29:10 +0000 (19:29 +0000)]

am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList

* commit 'acc497e4b7323341f830d3e399a846bc5a1ca763':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 19:29:04 +0000 (19:29 +0000)]

am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."

* commit '20d49271a5e196ae8b264235ebdba204fd0b254d':

commit | commitdiff | tree

Aravind Akella [Thu, 5 Dec 2013 19:28:58 +0000 (19:28 +0000)]

am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."

* commit 'd262fb60c987efd838995f213a9099bf6aa811c0':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 19:28:52 +0000 (19:28 +0000)]

am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."

* commit 'cdd4269d84e51ef713d8a8154ce89407fc3851c7':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 19:28:46 +0000 (19:28 +0000)]

am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."

* commit '89fe75419566668f2d1911bfcaaf8bb4e885600d':

commit | commitdiff | tree

Jeff Brown [Thu, 5 Dec 2013 19:28:40 +0000 (19:28 +0000)]

am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."

* commit '33f8fbd3de497d336e25068b69daf7645f9d0c38':

commit | commitdiff | tree

Jason Monk [Thu, 5 Dec 2013 19:28:34 +0000 (19:28 +0000)]

am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"

* commit '020d429dedc736a08c08b3fa702cf570a151f6fc':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:28:28 +0000 (19:28 +0000)]

am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout"

* commit '6888e50d2616d5ff37f9d5f20275b305dda3649a':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:28:27 +0000 (19:28 +0000)]

Merge "Add stacked padding mode to LayerDrawable"

commit | commitdiff | tree

Scott Main [Thu, 5 Dec 2013 19:28:21 +0000 (19:28 +0000)]

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 '37d77b198d4c3ee542711a96a727248c41ecefa8':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:28:17 +0000 (19:28 +0000)]

Merge "Allow alert dialogs to inflate custom view layouts"

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 19:28:15 +0000 (19:28 +0000)]

am 1883de04: am 49660c7c: Add support for broadcast intents

* commit '1883de0464d590b1562bc60b648475b5193559d4':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 19:28:09 +0000 (19:28 +0000)]

am 7bd12d5d: am f157b48e: Add support for matching explicit intents

* commit '7bd12d5d1119aa564bd4d03042dcd91017e59050':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 19:28:03 +0000 (19:28 +0000)]

am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents

* commit '201b12dd97312c4e16a72575de6bc92675c520dd':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 19:27:56 +0000 (19:27 +0000)]

am 3632f945: am b6223793: Add support for service intents

* commit '3632f94503c0b657b1d02c348e1c006bae5ac6ae':

commit | commitdiff | tree

Ben Gruver [Thu, 5 Dec 2013 19:27:41 +0000 (19:27 +0000)]

am eef10af9: am e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"

* commit 'eef10af98b3e6f4c50e5d211205d1263355a79b3':

commit | commitdiff | tree

Jeff Sharkey [Thu, 5 Dec 2013 19:27:30 +0000 (19:27 +0000)]

am 9a1237b5: am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks."

* commit '9a1237b5b982f939243be2c81b7c7a611ae5bd27':

commit | commitdiff | tree

Romain Guy [Thu, 5 Dec 2013 19:27:23 +0000 (19:27 +0000)]

am f56bbcc5: am 0b451b3a: Merge "Only destroy remote graphic buffers Bug #9795157"

* commit 'f56bbcc5202daf34d454686691d5b3f6390b9648':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:27:17 +0000 (19:27 +0000)]

am df29cde3: am d53e376c: Merge "Fix FastScroller regression for non-UI threads"

* commit 'df29cde3dddbe5836a6690a2f91705d931d0e006':