- 2a53847 am 329a5214: merge from open-source master by The Android Open Source Project · 15 years ago
- 3d95a00 merge from open-source master by The Android Open Source Project · 15 years ago
- add9e7f am e0a40686: am f066611a: retool resize logic to use max dimension and max area. by Mike Reed · 15 years ago
- 1fdcb17 am f066611a: retool resize logic to use max dimension and max area. by Mike Reed · 15 years ago
- 69a40bb am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo by Mike LeBeau · 15 years ago
- 4b54ad0 am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo by Mike LeBeau · 15 years ago
- 5ed86e4 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo by Mike LeBeau · 15 years ago
- 7765440 Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken by Mike Lockwood · 15 years ago
- 327117d Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken by Mike Lockwood · 15 years ago
- 03e65f7 Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken by Jim Miller · 15 years ago
- e6a6646 Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken by Jim Miller · 15 years ago
- a54fb4f am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo by Robert Greenwalt · 15 years ago
- 600f5d2 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo by Robert Greenwalt · 15 years ago
- c3a26bf Merge "Add multi-sim support to ThrottleService." into froyo by Robert Greenwalt · 15 years ago
- a0a7115 Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken by Mathias Agopian · 15 years ago
- 5629eb1 when a zero dimension buffer is allocated, turn the allocation into by Mathias Agopian · 15 years ago
- 4369bc5 Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken by Dianne Hackborn · 15 years ago
- f70f7d0 am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo by Dianne Hackborn · 15 years ago
- 0ac81b9 am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo by Robert Greenwalt · 15 years ago
- e147546 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo by Dianne Hackborn · 15 years ago
- e0cae12 Merge "A little more improvement of the Service javadoc." into froyo by Dianne Hackborn · 15 years ago
- 6eb6129 am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo by Robert Greenwalt · 15 years ago
- d3fd93b Merge "Fix SntpClient to give accurate time info." into froyo by Robert Greenwalt · 15 years ago
- 0a7b355 am 7a4b22f6: am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA. by David 'Digit' Turner · 15 years ago
- 9c66aa0 am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA. by David 'Digit' Turner · 15 years ago
- ace7ec4 am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyo by Kenny Root · 15 years ago
- 05a192d am fa22de79: Merge "Import revised translations" into froyo by Kenny Root · 15 years ago
- bb87a93 Merge "Import revised translations" into froyo by Kenny Root · 15 years ago
- 9f03441 am f5a886d5: am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo by Mike Lockwood · 15 years ago
- 7d34b4d am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo by Mike Lockwood · 15 years ago
- c1f32b0 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo by Mike Lockwood · 15 years ago
- 4dd113a am ded77760: am 90d3f458: API 8! by Dianne Hackborn · 15 years ago
- 7230aea am 90d3f458: API 8! by Dianne Hackborn · 15 years ago
- ed51004 am 1424d1d2: am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo by Robert Greenwalt · 15 years ago
- 8a7ff1f am 0751d1ea: am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. by Suchi Amalapurapu · 15 years ago
- 1db843f am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo by Robert Greenwalt · 15 years ago
- eaf56de am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. by Suchi Amalapurapu · 15 years ago
- 8ae5bf5 Merge "Sholes mobile iface comes/goes - handle the reset" into froyo by Robert Greenwalt · 15 years ago
- 27f962f am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo by Dianne Hackborn · 15 years ago
- f335f42 am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo by Dianne Hackborn · 15 years ago
- 62636a7 Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo by Dianne Hackborn · 15 years ago
- 7484138 am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo by Dmitri Plotnikov · 15 years ago
- 8b3cb0d am 5304d8fd: Merge "Introducing "strict project map"." into froyo by Dmitri Plotnikov · 15 years ago
- a5522ce am 2ef6e442: am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storag by Suchi Amalapurapu · 15 years ago
- d3f849b Merge "Introducing "strict project map"." into froyo by Dmitri Plotnikov · 15 years ago
- fb2724f am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard i by Suchi Amalapurapu · 15 years ago
- a8b0ff4 Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo by Suchi Amalapurapu · 15 years ago
- ddf1dd1 am e7d5a2f9: am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo by Mathias Agopian · 15 years ago
- ee2d060 am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo by Mathias Agopian · 15 years ago
- 90e4793 Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo by Mathias Agopian · 15 years ago
- b343429 am 1e21ec92: am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo by Suchi Amalapurapu · 15 years ago
- b955d51 am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo by Suchi Amalapurapu · 15 years ago
- d58d8f6 Merge "Add ordered broadcast when removing packages." into froyo by Suchi Amalapurapu · 15 years ago
- ca99fb8 fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart) by Mathias Agopian · 15 years ago
- b3c91bd Merge "GpsLocationProvider: optimize wake lock usage." into kraken by Mike Lockwood · 15 years ago
- 9b67569 Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken by Patrick Scott · 15 years ago
- c9d9404 am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo by Vasu Nori · 15 years ago
- 0df972e am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo by Grace Kloba · 15 years ago
- 773dbcc am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo by Vasu Nori · 15 years ago
- 58ab590 am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo by Grace Kloba · 15 years ago
- 661bc51 Merge "verify database state before calling sqlite. Bug:2593970" into froyo by Vasu Nori · 15 years ago
- 218aa6b Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo by Grace Kloba · 15 years ago
- 01974f8 am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. by Eric Laurent · 15 years ago
- c70ceda Merge "Missing resources for lock screen." into kraken by Daniel Sandler · 15 years ago
- 7c5ee74 am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo by Eric Laurent · 15 years ago
- 6f4b396 am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo by Andrei Popescu · 15 years ago
- 4e52baf am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo by Dianne Hackborn · 15 years ago
- 7cb5382 am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo by James Dong · 15 years ago
- 508526a am 57e60854: am 22b3644a: Update the datause icons. by Robert Greenwalt · 15 years ago
- 04a77cc am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo by Robert Greenwalt · 15 years ago
- d3e0d42 am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo by Leon Scroggins · 15 years ago
- ecfe432 am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo by Kristian Monsen · 15 years ago
- 8d44aec am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo by Kristian Monsen · 15 years ago
- 4024e20 am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. by Eric Laurent · 15 years ago
- 0536e32 am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo by Eric Laurent · 15 years ago
- 8dd91d1 am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo by Andrei Popescu · 15 years ago
- 21989a7 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo by Dianne Hackborn · 15 years ago
- d198c9d am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo by James Dong · 15 years ago
- dfea74e am 22b3644a: Update the datause icons. by Robert Greenwalt · 15 years ago
- d241170 am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo by Robert Greenwalt · 15 years ago
- 0b450ac am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo by Leon Scroggins · 15 years ago
- 199bc05 am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo by Kristian Monsen · 15 years ago
- bb80da1 am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo by Kristian Monsen · 15 years ago
- 8155b78 Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo by Eric Laurent · 15 years ago
- 46e935b manual merge by Jean-Baptiste Queru · 15 years ago
- 41ac20f Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo by Andrei Popescu · 15 years ago
- b1016fe Merge "Fix issue #593153: Broadcast time out when sending..." into froyo by Dianne Hackborn · 15 years ago
- 685bc90 Merge "Use PV_PLAYER to handle RTSP streaming" into froyo by James Dong · 15 years ago
- 281cec9 Merge "Perist Throttle data across reboots" into froyo by Robert Greenwalt · 15 years ago
- c566beb Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo by Leon Scroggins · 15 years ago
- e56943a Merge "Fix for 2585858, load invalid urls." into froyo by Kristian Monsen · 15 years ago
- 43229f2 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo by Kristian Monsen · 15 years ago
- aef7790 Merge "Manually integrating froyo lockscreen fixes:" into kraken by Daniel Sandler · 15 years ago
- 534f5b4 am 7b16f95c: am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo by Dianne Hackborn · 15 years ago
- 8950fec am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo by Dianne Hackborn · 15 years ago
- 01cc0c1 am cd616247: am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes by Dianne Hackborn · 15 years ago
- c308249 Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo by Dianne Hackborn · 15 years ago
- fa88e25 am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes by Dianne Hackborn · 15 years ago
- 77701be am fbd22f07: am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo by Dianne Hackborn · 15 years ago
- 8c16dfa am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo by Dianne Hackborn · 15 years ago