Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_native / b66cc3d5fc928f77190e84f2baa3dee12edbfb10
  1. b66cc3d am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  2. 4feb59c resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  3. 00ff0ca am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  4. 2de4863 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  5. ea6193c am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
  6. bd9100b Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  7. d567127 Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread by Gilles Debunne · 14 years ago
  8. 5a45a3e am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
  9. 4e29229 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
  10. 2652f09 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
  11. ee76b4c Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
  12. 7964f5b am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
  13. 6e53d8e am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
  14. 928595e am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
  15. 096b928 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp by Nick Pelly · 14 years ago
  16. 33dff53 am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  17. bd7c76e Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  18. dc87971 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin by Gloria Wang · 14 years ago
  19. 50e4bf4 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 by Gloria Wang · 14 years ago
  20. 817b0a5 am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  21. 52cf8ff am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  22. 6f1547b Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  23. 0b72b4e Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  24. e9459dc am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
  25. 96b60ba Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
  26. 108fa5a am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  27. 884c410 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  28. ec7c7f0 am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  29. 103a217 Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  30. 938125d am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 by Adam Powell · 14 years ago
  31. ba23ee2 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 by Adam Powell · 14 years ago
  32. 2e3c2f0 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  33. 9f669c5 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  34. a05c7c2 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
  35. 71df979 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 by Nicolas Roard · 14 years ago
  36. 52d2b87 Merge "HTML5 Video improvements" into honeycomb-mr1 by Nicolas Roard · 14 years ago
  37. 0f1351e am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
  38. eb9d908 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
  39. d395d37 Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp by Robert Greenwalt · 14 years ago
  40. fce2201 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp by Robert Greenwalt · 14 years ago
  41. f3f7d35 Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
  42. 367798e am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  43. fd30a36 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  44. 09eaf60 am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
  45. 6cc95a9 am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
  46. 447b17b Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
  47. e64fc17 am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
  48. 1b9ff06 am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
  49. bac02fd am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 by Mike Lockwood · 14 years ago
  50. e195b4b Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 by Mike Lockwood · 14 years ago
  51. d3e53c1 am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 by Christopher Tate · 14 years ago
  52. 6fc20b0 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 by Christopher Tate · 14 years ago
  53. 8d4fb33 am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  54. c9712bb am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  55. 1f8c98d Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  56. 3a9c0a0 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  57. 71d6c882 Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
  58. f0e9794 Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
  59. afada75 am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  60. 2ee08a1 Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  61. ef22134 am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  62. 1fc8136 Merge "Support for USB accessory URIs" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  63. 860a931 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 by Jim Miller · 14 years ago
  64. 21daa91 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 by Jim Miller · 14 years ago
  65. 7129208 am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  66. d295c27 Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  67. 500608d am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1 by Justin Ho · 14 years ago
  68. bce08ae Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1 by Justin Ho · 14 years ago
  69. 2672362 am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 by Adam Powell · 14 years ago
  70. 8b6836f am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  71. c59d880 Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 by Adam Powell · 14 years ago
  72. 23fc902 Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  73. 974b333 am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1 by Huahui Wu · 14 years ago
  74. df328a2 Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1 by Huahui Wu · 14 years ago
  75. 06b72dc am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 by Ken Sumrall · 14 years ago
  76. 45d6471 Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 by Ken Sumrall · 14 years ago
  77. da38c1f am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 by Jamie Gennis · 14 years ago
  78. c2cc1b3 Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 by Jamie Gennis · 14 years ago
  79. ca9cbe8 am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  80. 069160e Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  81. 7b45a5b am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  82. 40ce089 Merge "Inline HTML5 Video support" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  83. 4bbbdba am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 by Adam Powell · 14 years ago
  84. 672f2f2 Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 by Adam Powell · 14 years ago
  85. 37ee500 am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). by Nick Pelly · 14 years ago
  86. 7a4d0df SurfaceFlinger: Respect the PROTECTED gralloc bit. by Jamie Gennis · 14 years ago
  87. 3c041ed am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb by Scott Main · 14 years ago
  88. 229042c am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb by Scott Main · 14 years ago
  89. af268ff am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 by Xia Wang · 14 years ago
  90. 3b4f8b2 am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb by Scott Main · 14 years ago
  91. 0b01fcc am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb by Scott Main · 14 years ago
  92. 4161328 Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 by Xia Wang · 14 years ago
  93. e3fd9b8 Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb by Scott Main · 14 years ago
  94. ffb7903 Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb by Scott Main · 14 years ago
  95. ba0f2a3 am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  96. 85df206 Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  97. e37f468 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 by Xia Wang · 14 years ago
  98. 29b37fc am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  99. 8e59190 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  100. 696229e Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb by Xia Wang · 14 years ago