Joe Malin
|
ed3c683ac7
|
am b17aae49: (-s ours) am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit 'b17aae49873f857c40a46ca9db1aacdcd8c33f1c':
|
2013-12-05 22:39:31 +00:00 |
|
The Android Open Source Project
|
a9e850e00a
|
am 9e70700c: (-s ours) am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '9e70700c614179b036120513665f78f3656e9af3':
|
2013-12-05 22:39:26 +00:00 |
|
Marco Nelissen
|
4a3d717374
|
am dfc34c7a: (-s ours) am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit 'dfc34c7aa0bb03522d34b075f93d92f8d1e60e7d':
|
2013-12-05 22:39:21 +00:00 |
|
Marco Nelissen
|
6459bf65de
|
am e3a1f7b6: (-s ours) am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'e3a1f7b6614e9e42f45f3de8ca3e3e07c69573bc':
|
2013-12-05 22:39:15 +00:00 |
|
Amith Yamasani
|
14ef61d9cd
|
am 1cb3c233: (-s ours) am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev
* commit '1cb3c2332d86c06799b75e74b8263f008b79cdf3':
|
2013-12-05 22:39:10 +00:00 |
|
David Christie
|
43347a9280
|
am a840c3c5: (-s ours) am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that
* commit 'a840c3c5a5951cf2b5aae674c3cdf450ca1bd5a7':
|
2013-12-05 22:39:04 +00:00 |
|
John Spurlock
|
3d5f39a02b
|
am cb0a2ddb: (-s ours) am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev
* commit 'cb0a2ddb71f0bb7bd66a5365692fb37c96c8b72f':
|
2013-12-05 22:38:58 +00:00 |
|
Daniel Sandler
|
8e497ff814
|
am 44f97445: (-s ours) am 4a76922e: am d646882a: Add missing densities for HUN backgrounds.
* commit '44f974453da560eb05b853144cc7659c7aa79b0d':
|
2013-12-05 22:38:52 +00:00 |
|
Daniel Sandler
|
2b76ff0d02
|
am c1c5d2df: (-s ours) am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev
* commit 'c1c5d2dfd5b66e3efb73b9e18dd9f37c6d69078a':
|
2013-12-05 22:38:46 +00:00 |
|
Craig Mautner
|
1ab7817532
|
am 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE
* commit '7815c8bd17b85010c7203f2575bce30079c70a49':
|
2013-12-05 22:38:40 +00:00 |
|
John Spurlock
|
796e56ce27
|
am af0ea645: (-s ours) am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade."
* commit 'af0ea64596c5a7e59f103c6832d3d7db4f384b52':
|
2013-12-05 22:38:35 +00:00 |
|
Chris Wren
|
504f0a9729
|
am 090a46b5: (-s ours) am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent.
* commit '090a46b54cd1dc21ea4e42eb0e21b01d4a7f2587':
|
2013-12-05 22:38:30 +00:00 |
|
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 |
|