- 2b89bfb am 758485f0: (-s ours) am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev by Jose Lima · 12 years ago
- d890c68 am e4fdda27: (-s ours) 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 by David Christie · 12 years ago
- 29cc87d am 44e0da4e: (-s ours) am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev by Kristian Monsen · 12 years ago
- 82ae155 am ba690f48: (-s ours) am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev by Vinit Deshapnde · 12 years ago
- 4ab8638 am 44894df5: (-s ours) am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev by keunyoung · 12 years ago
- 94388e2 am 054a7f5c: (-s ours) am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev by Michael Wright · 12 years ago
- 416a573 am 5126f194: (-s ours) am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev by Victoria Lease · 12 years ago
- 1ef2d26 am 1668ebf4: (-s ours) am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev by Romain Guy · 12 years ago
- d762c97 am f5a89a2b: (-s ours) am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev by Alan Viverette · 12 years ago
- c9c4e8d8 am ae2b3981: (-s ours) am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev by Svetoslav · 12 years ago
- 3b219bf am a004f72c: (-s ours) am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev by Chet Haase · 12 years ago
- 2aa9f1f am 7a9ec2cd: (-s ours) am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev by Craig Mautner · 12 years ago
- b21b50a am 6acc2743: (-s ours) am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb by Katie McCormick · 12 years ago
- 3b1b6d1 am aff9c487: (-s ours) am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev by Selim Gurun · 12 years ago
- ea10b06 am 9b7bf2ba: (-s ours) am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev by Romain Guy · 12 years ago
- f339215 am d7889768: (-s ours) 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." by Scott Main · 12 years ago
- 8517e7e am 6fa95b46: (-s ours) am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later. by Scott Main · 12 years ago
- 2177ee4 am 2717e4ea: (-s ours) am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef by Andreas Huber · 12 years ago
- 8f59c07 am 1d4ddb05: (-s ours) am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE by Martin Kosiba · 12 years ago
- fb4482c am 231fb187: (-s ours) am 4826434c: am ed735c9a: Add missing cleanspec by Ben Murdoch · 12 years ago
- 642596f am 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev by Jeff Sharkey · 12 years ago
- e50892e am 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev by Jeff Sharkey · 12 years ago
- 3541983 am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev by Jeff Sharkey · 12 years ago
- 3f9ceb0 am 134f1e9b: (-s ours) am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev by Jeff Sharkey · 12 years ago
- 5dc434e am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev by Svetoslav Ganov · 12 years ago
- 94dbf1f am ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev by Svetoslav Ganov · 12 years ago
- a9cd876 am 61dce579: (-s ours) am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev by Craig Mautner · 12 years ago
- afefad3 am 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null. by Wink Saville · 12 years ago
- 2a43b68 am 980ae54d: (-s ours) am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev by Katie McCormick · 12 years ago
- b989320 am 87251061: (-s ours) am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev by Zhihai Xu · 12 years ago
- 01431b0 am 5174a7a0: (-s ours) am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev by destradaa · 12 years ago
- a7aae4f am 3edd90d4: (-s ours) am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev by Dianne Hackborn · 12 years ago
- 5d8abc5 am 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev by Romain Guy · 12 years ago
- c6b6e7f am e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 12 years ago
- 834672c am 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev by Romain Guy · 12 years ago
- 503177e am 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 12 years ago
- 30eca9f am a6872c84: (-s ours) am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev by Dianne Hackborn · 12 years ago
- d007f12 am fb113bd7: (-s ours) am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev by Chet Haase · 12 years ago
- d742da3 am 3ecda672: (-s ours) am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev by keunyoung · 12 years ago
- de65187 am cf5e3137: (-s ours) am f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev by Craig Mautner · 12 years ago
- 1474e67 am 9cdbcbad: (-s ours) am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev by Colin Cross · 12 years ago
- bf612ed am e6a7f2c1: (-s ours) am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev by Martijn Coenen · 12 years ago
- 680db96 am 3b59a334: (-s ours) am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev by Alan Viverette · 12 years ago
- 1dda085 am 91e1cb99: (-s ours) am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev by Geoffrey Borggaard · 12 years ago
- ad3f0c1 am 9fe98de0: (-s ours) am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev by Fabrice Di Meglio · 12 years ago
- 55158d5 am e286c012: (-s ours) am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev by Dianne Hackborn · 12 years ago
- 278bfc6 am 6317f13e: (-s ours) am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev by Fabrice Di Meglio · 12 years ago
- 72b106e am d7f6aff9: (-s ours) am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred." by Elliott Hughes · 12 years ago
- 492c01d am 0a128348: (-s ours) am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev by Mathias Agopian · 12 years ago
- 6bc651d am 8df8225d: (-s ours) am ac322988: am 00312300: Remove an unnecessary allocation by Romain Guy · 12 years ago
- 1f3588a am 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev by Jeff Sharkey · 12 years ago
- 186b782 am 0785ccc2: (-s ours) am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev by Svetoslav · 12 years ago
- 8f123ed am bb76afa9: (-s ours) am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev by Jeff Sharkey · 12 years ago
- 4fecb21 am 177b89e9: (-s ours) am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev by Jonathan Dixon · 12 years ago
- b117600 am f3aca5f7: (-s ours) 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 by Wink Saville · 12 years ago
- 7ac1ec4 am 47dc5a34: (-s ours) am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev by Wink Saville · 12 years ago
- c2890d4 am 15357144: (-s ours) am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev by Wink Saville · 12 years ago
- aa9fdb3 am cc951f12: (-s ours) am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev by Jeff Brown · 12 years ago
- bdc0b4b am 027b0651: (-s ours) am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev by Wink Saville · 12 years ago
- a7cd4f1 am ede85d2a: (-s ours) am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs by Joe Malin · 12 years ago
- f330141 am bfdb10d2: (-s ours) am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings... by Dianne Hackborn · 12 years ago
- d3d4201 am 89424f35: (-s ours) am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev by destradaa · 12 years ago
- 39ee573 am 542ff71a: (-s ours) am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes. by Dianne Hackborn · 12 years ago
- 905a29d am 7f6e1aff: (-s ours) 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 by David Christie · 12 years ago
- 2802f9d am f3eb44f2: (-s ours) am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev by Vinit Deshapnde · 12 years ago
- ed3c683 am b17aae49: (-s ours) am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178 by Joe Malin · 12 years ago
- a9e850e 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 by The Android Open Source Project · 12 years ago
- 4a3d717 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." by Marco Nelissen · 12 years ago
- 6459bf6 am e3a1f7b6: (-s ours) am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together." by Marco Nelissen · 12 years ago
- 14ef61d am 1cb3c233: (-s ours) am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev by Amith Yamasani · 12 years ago
- 43347a9 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 by David Christie · 12 years ago
- 3d5f39a am cb0a2ddb: (-s ours) am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev by John Spurlock · 12 years ago
- 8e497ff am 44f97445: (-s ours) am 4a76922e: am d646882a: Add missing densities for HUN backgrounds. by Daniel Sandler · 12 years ago
- 2b76ff0 am c1c5d2df: (-s ours) am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev by Daniel Sandler · 12 years ago
- 1ab7817 am 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE by Craig Mautner · 12 years ago
- 796e56c am af0ea645: (-s ours) am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade." by John Spurlock · 12 years ago
- 504f0a9 am 090a46b5: (-s ours) am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent. by Chris Wren · 12 years ago
- b606f59 am ebf8af74: (-s ours) am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot" by Chris Wren · 12 years ago
- ab90480 am a866f6df: (-s ours) am cf67ae06: am 137e5a3b: Merge "Fix the build" by Ben Murdoch · 12 years ago
- 1d81729 am 87a4a466: (-s ours) am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification by Chris Wren · 12 years ago
- 4e15cb3 am 7f5709bb: (-s ours) am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade." by Chris Wren · 12 years ago
- 903f69a am 6241ee27: (-s ours) am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized." by Chris Wren · 12 years ago
- 01b3091 am 6709285a: (-s ours) am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets." by Chris Wren · 12 years ago
- 6bda8f1 am 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services" by Matt Casey · 12 years ago
- 33b8084 am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host." by Martijn Coenen · 12 years ago
- 153dbe9 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}." by Ying Wang · 12 years ago
- 1017ecb am 2316b2b3: (-s ours) am b9f16399: am a50f4b1d: Merge "Simplify LinkPropertiesTest." by Lorenzo Colitti · 12 years ago
- c2bd327 am 42bf3aaa: (-s ours) am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback." by Svetoslav Ganov · 12 years ago
- afc5506 am 96c5475f: (-s ours) am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList by Satoshi Kataoka · 12 years ago
- 16d083d am 83852c5f: (-s ours) am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers." by Jeff Sharkey · 12 years ago
- 0361e12 am 6904c5f0: (-s ours) am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR." by Aravind Akella · 12 years ago
- c7aabc6 am a2e33fba: (-s ours) am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests." by Jeff Brown · 12 years ago
- 626fb9a am 30345f64: (-s ours) am 89fe7541: am 7a54069a: Merge "Dump information about recent input events." by Jeff Brown · 12 years ago
- ed2f7bf am 8cfbb064: (-s ours) am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information." by Jeff Brown · 12 years ago
- 10bb8b4 am 73f61c80: (-s ours) am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration" by Jason Monk · 12 years ago
- 1c9248a am 2166b9b8: (-s ours) am 6888e50d: am ea55b229: Merge "Fix initial FastScroller enabled state, fix padding during layout" by Alan Viverette · 12 years ago
- 61c5f66 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 by Scott Main · 12 years ago
- ab18470 am 8494a6e3: (-s ours) am 1883de04: am 49660c7c: Add support for broadcast intents by Ben Gruver · 12 years ago
- 2e957e3 am 4196d956: (-s ours) am 7bd12d5d: am f157b48e: Add support for matching explicit intents by Ben Gruver · 12 years ago
- 4816a1e am 46389b40: (-s ours) am 201b12dd: am f5323fee: Pass in the ComponentName of the resolved service for service intents by Ben Gruver · 12 years ago