OSDN Git Service

resolved conflicts for merge of 534f3e94 to jb-mr1-dev
[android-x86/frameworks-base.git] / include / private /
2012-08-31 Wink SavilleMerge "Fix code problem in writePidDns"
2012-08-17 Jean-Baptiste QueruMerge "TabHost key handling corrected"
2012-08-14 Mike LockwoodMerge "Added missing USB_DEVICE_ATTACHED broadcast...
2012-08-13 Jean-Baptiste QueruMerge "Added missing viewport meta tag to html resources"
2012-08-08 Jean-Baptiste QueruMerge "Normalize output from aapt d xmltree"
2012-08-08 Jean-Baptiste QueruMerge "Fix cursor memory leak"
2012-07-30 Adam PowellMerge " Fix preload classname for phone policy."
2012-07-25 Dake Guam 4d716708: (-s ours) Merge "synchronized audio beat...
2012-07-20 John Grossmanam 1bcfeafe: (-s ours) DO NOT MERGE: common_time: Turn...
2012-07-19 John Grossmanam c43a685c: (-s ours) Merge "Change audio flinger...
2012-07-17 Jason Simmonsam 2da0bbc8: (-s ours) DO NOT MERGE - Set the SO_BROADC...
2012-07-07 Romain Guyam dc99555d: Merge "Pass SearchView suggestion cursor...
2012-06-28 John Grossmanam 194f6bc7: (-s ours) Fix for bug 6691452 : DO NOT...
2012-06-27 John Grossmanam 02792467: (-s ours) Utils: Fix a bug in the linear...
2012-06-25 Dianne Hackbornam 612ca9c6: (-s ours) Merge "Fix shutdown sequence...
2012-06-23 Jean-Baptiste Queruam 5f77f82e: Merge "Another case of extra ">""
2012-06-23 Jean-Baptiste Queruam b8b47c22: Merge "Remove redundant ">""
2012-06-23 Jean-Baptiste Queruresolved conflicts for merge of f8f76d52 to jb-dev...
2012-06-23 Jason Simmonsam 92f5f589: (-s ours) Do not report a duration for...
2012-06-22 Jean-Baptiste Queruam 8c71784e: Merge "Initialize mJunkPath to false"
2012-06-21 Kenny Rootam a9543a3d: Merge "Pass additional inputs when spawnin...
2012-06-21 Kenny RootMerge "Pass additional inputs when spawning apps via...
2012-06-18 Scott AndersonMerge "Clean up IntToStrings for window TYPE_*"
2012-06-18 Jean-Baptiste Queruam 20d6caf8: Merge "Fix issue #13366. Take account...
2012-06-15 Kenny Rootam 0cf34218: Merge "Adding test cases for getInstalledP...
2012-06-15 Jean-Baptiste Queruam 2dd63ccd: am d8ccd712: Merge "Parcel compRequired...
2012-06-14 Raphael Mollresolved conflicts for merge of 8cf489c1 to jb-dev...
2012-06-14 Jason Simmonsam 1d28fef9: Stop any running DHCP client before bringu...
2012-06-14 Matthew Xieam 61c0fc41: (-s ours) DO NOT MERGE - cherry pick a...
2012-06-13 John Grossmanam 8f267c4a: (-s ours) LibAAH_RTP: Fix a deserializatio...
2012-06-13 Jean-Baptiste Queruam cfe75518: (-s ours) am 9b2b0527: Merge "Only check...
2012-06-12 Robert Greenwaltam 15319ded: am 460abe97: Merge "Add support for Caller...
2012-06-12 Jean-Baptiste Queruresolved conflicts for merge of 29bea61c to jb-dev...
2012-06-12 Geremy Condraam e1b573a3: (-s ours) am b4151b29: (-s ours) Merge...
2012-06-11 Dianne Hackbornam 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper...
2012-06-11 Dianne Hackbornam 2e479fef: am bb536096: Merge "Improved documentation...
2012-06-11 Wink Savilleam 4853f944: am 3fe79dfd: Merge "Adds utility method...
2012-06-11 Dianne Hackbornam f6e39b06: am a03696dc: Merge "ApplicationThread...
2012-06-11 Wink Savilleam c07055c4: am bc69f97c: Merge "Adds documentation...
2012-06-11 Dianne HackbornMerge "SystemServer: Looper's getMainLooper to return...
2012-06-11 Dianne HackbornMerge "Improved documentation (clarify on issue 8727)"
2012-06-11 Dianne HackbornMerge "ApplicationThread: Check interface before invoki...
2012-06-11 Wink SavilleMerge "Adds documentation to CdmaCellLocation get lat...
2012-06-11 Jean-Baptiste Queruam 237fa190: (-s ours) am 68ecb32e: Merge "stagefright...
2012-06-11 Jean-Baptiste Queruresolved conflicts for merge of 80d21f2f to jb-dev...
2012-06-11 Jean-Baptiste Queruam 6c50da75: am 7d77977f: Merge "Fix Force Close when...
2012-06-11 Dianne Hackbornam 574352a7: am aa8cac86: Merge "frameworks/base: relea...
2012-06-11 Jean-Baptiste Queruresolved conflicts for merge of cddaf4d5 to jb-dev...
2012-06-11 Steve BlockMerge "Fix style for Geolocation mock mechanism"
2012-06-09 Dianne Hackbornam c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState...
2012-06-09 Dianne HackbornMerge "frameworks/base: release references of UriPermis...
2012-06-08 Jean-Baptiste Queruam 60c77212: am 2a393a99: Merge "MountService: unlink...
2012-06-08 Jean-Baptiste Queruam 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright...
2012-06-08 Jean-Baptiste QueruMerge "MountService: unlink death notification when...
2012-06-08 Jean-Baptiste QueruMerge "stagefright aacenc: Add parentheses in expressio...
2012-06-08 Kenny Rootam 63dd4c65: am 60b3d59d: Merge "Modify installd to...
2012-06-08 Jonathan DixonMerge "Separate interface and implementation of 2 more...
2012-06-08 Kenny Rootresolved conflicts for merge of 9855f6e2 to jb-dev...
2012-06-08 Kenny RootMerge "Modify installd to set the SELinux security...
2012-06-08 Kenny RootMerge "Add JNI bindings for some of the libselinux...
2012-06-08 Jean-Baptiste Queruam 644e43e0: am 3e3d641c: Merge "Added mpga as valid...
2012-06-08 Gilles DebunneMerge "Added a tvdpi specific background 9 patch" into...
2012-06-08 Jean-Baptiste Queruam 871bcd9d: (-s ours) am b7733870: Merge "Aligning...
2012-06-07 Victoria LeaseMerge "Fix hardcoded font path. Allow adding new font...
2012-06-07 The Android Open... Reconcile with jb-release nakasi-factoryrom-release
2012-06-06 Jean-Baptiste Queruam c9fe6568: am 9e22d9c5: Merge "Fix "Too many open...
2012-06-05 Ying WangMerge "Fix "Too many open files" error for aapt built...
2012-06-05 Tor Norbyeam 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore...
2012-06-04 George MountMerge "Support selections within scrollable text areas."
2012-06-04 George MountMerge "Change from left/right to base/extent for select...
2012-06-04 Fabrice Di MeglioMerge "Make Switch widget aware of layout direction"
2012-06-04 Jeff BrownMerge "Implement an integrating VelocityTracker strateg...
2012-06-04 Jeff BrownMerge "Make velocity tracker strategy configurable...
2012-06-04 Jeff BrownMerge "Clamp the minimum screen brightness."
2012-06-03 Daniel SandlerMerge "Hide notifications until the device is provision...
2012-06-03 The Android Automergermerge in jb-release history after reset to jb-dev
2012-06-03 Craig MautnerMerge "Revert change to correct animations." into jb-dev
2012-06-02 Michael JurkaMerge "Add more logging for bug 6499508 (getting warmer...
2012-06-02 Michael JurkaMerge "Reduce recents memory usage" into jb-dev
2012-06-02 Craig MautnerMerge "Fix power manager issues." into jb-dev
2012-06-02 Jean-Baptiste Queruam 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal...
2012-06-02 Jean-Baptiste QueruMerge "aapt: Remove terminal pointer incrementaion"
2012-06-02 Ben MurdochMerge "Get a WebViewDatabaseClassic instance lazily...
2012-06-02 Ruei-sung LinMerge "Fix b/6575950 make shader program to support...
2012-06-01 Adam PowellMerge "Update indeterminate progress bar assets" into...
2012-06-01 Daniel SandlerMerge "Be more discriminating when canceling notificati...
2012-06-01 Daniel SandlerMerge "Present a one-time chooser when sharing screensh...
2012-06-01 Svetoslav GanovMerge "Cannot double tap and hold outside of the input...
2012-06-01 Dianne HackbornMerge "Survey says: NIET!" into jb-dev
2012-06-01 Jeff BrownMerge "Add a thread to handle the radio shutdown."...
2012-06-01 Fabrice Di MeglioMerge "Clean up layout direction APIs for Drawable"
2012-06-01 Svetoslav GanovMerge "AccessibilityInteractionController crash with...
2012-06-01 Andrew FlynnMerge "Refresh signal cluster for airplane switch....
2012-06-01 Jean-Michel TriviMerge "Handle wakelocks for device connection intents...
2012-06-01 Svetoslav GanovMerge "Increase string length limit to fit translation...
2012-06-01 Svetoslav GanovMerge "Accessibility focus traversal of lists inconsist...
2012-06-01 Chet Haaseam d0140062: am 561ff8a7: Merge "Skip eglSwapBuffers...
2012-06-01 Chet Haaseam 561ff8a7: Merge "Skip eglSwapBuffers() call when...
2012-06-01 Chet HaaseMerge "Skip eglSwapBuffers() call when we do not draw...
2012-06-01 Chet HaaseSkip eglSwapBuffers() call when we do not draw to GL
next