Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 966bfa8df40d3d27bacdb2d9f8eb05c3eebafd01
  1. 966bfa8 am 01252217: Merge "Fix javadoc." into klp-modular-dev by Torne (Richard Coles) · 11 years ago
  2. 0125221 Merge "Fix javadoc." into klp-modular-dev by Torne (Richard Coles) · 11 years ago
  3. ae327cd am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 11 years ago
  4. 0289929 am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 11 years ago
  5. 5aa9c5a Fix javadoc. by Torne (Richard Coles) · 11 years ago
  6. c3281db am 65325236: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 11 years ago
  7. da07fe6 am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java" by Jeff Sharkey · 11 years ago
  8. eeb36c5 am d88d8174: Merge "Null pointer exception in FileRotator.java" by Jeff Sharkey · 11 years ago
  9. 6532523 Import translations. DO NOT MERGE by Geoff Mendal · 11 years ago
  10. d88d817 Merge "Null pointer exception in FileRotator.java" by Jeff Sharkey · 11 years ago
  11. f096ed6 am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516 by Leon Scroggins III · 11 years ago
  12. 96978ee am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE by Leon Scroggins III · 11 years ago
  13. 2fd045c DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516 by Leon Scroggins III · 11 years ago
  14. f8d8777 Update framework to use M33 Skia. DO NOT MERGE by Leon Scroggins III · 11 years ago
  15. adb3a19 am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." by Steve Moyer · 11 years ago
  16. 05d855d am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." by Steve Moyer · 11 years ago
  17. d93e7b2 Merge "Don't attempt to launch disabled activities in smoke test." by Steve Moyer · 11 years ago
  18. 5b98618 am ca0aba39: Merge commit \'54d5702c\' into manualmerge by Craig Mautner · 11 years ago
  19. ca0aba3 Merge commit '54d5702c' into manualmerge by Craig Mautner · 11 years ago
  20. 42dd0bb am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev by Tim Kilbourn · 11 years ago
  21. 30260c7 am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  22. 1830652 am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  23. 9539b4a Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev by Tim Kilbourn · 11 years ago
  24. 203a6dd am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  25. 39fc43b am 4111e7e1: am 09421fab: Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  26. 54d5702 am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev by Craig Mautner · 11 years ago
  27. 105c479 am 10a07a04: Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  28. 477897a Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev by Craig Mautner · 11 years ago
  29. fdf28cc Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE. by Craig Mautner · 11 years ago
  30. 4111e7e am 09421fab: Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  31. 10a07a0 Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  32. 1470883 am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  33. 5df673d am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge by Craig Mautner · 11 years ago
  34. c05362b am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  35. 8a6ab82 am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  36. 149fd6d am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  37. f6f0946 am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge by Craig Mautner · 11 years ago
  38. 7794330 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  39. c610380 am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  40. 09421fa Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  41. 685831b am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev by Mike Lockwood · 11 years ago
  42. f9b9043 am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev by Mike Lockwood · 11 years ago
  43. 4a02e07 am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  44. 788fb96 am 47653f2d: Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  45. 47653f2 Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  46. 07a1e23 Move options buffers to top scope by Dave Allison · 11 years ago
  47. 9c3fc0c am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  48. 0722968 FEATURE_LEANBACK implies that the device is a tv. by Tim Kilbourn · 11 years ago
  49. 9873e09 am 55740325: Merge "Add leanback device features." into klp-modular-dev by Tim Kilbourn · 11 years ago
  50. 5574032 Merge "Add leanback device features." into klp-modular-dev by Tim Kilbourn · 11 years ago
  51. eb95e74 DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  52. f8ce43e am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  53. 1365d98 am 4cde7734: Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  54. 4cde773 Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  55. 7890eef am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs by Ricardo Cervera · 11 years ago
  56. 571c171 am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs by Joe Fernandez · 11 years ago
  57. 4108431 am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page. by John Spurlock · 11 years ago
  58. c12c92b am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs by Ricardo Cervera · 11 years ago
  59. 9c5c5a8 am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs by Katie McCormick · 11 years ago
  60. 399cac5 am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs by John Spurlock · 11 years ago
  61. 7238585 am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev by JP Abgrall · 11 years ago
  62. 4b59883 am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev by Chad Brubaker · 11 years ago
  63. 9011908 am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev by Svetoslav · 11 years ago
  64. d590516 am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev by Adrian Roos · 11 years ago
  65. 6349252 am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  66. f29a498 am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev by Dianne Hackborn · 11 years ago
  67. 88768cc am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev by Jeff Brown · 11 years ago
  68. 882ba89 am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs by Ricardo Cervera · 11 years ago
  69. 58f019a am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs by Joe Fernandez · 11 years ago
  70. 28ac0c1 am ad66c27b: am 6d9b034c: Fix typo in public logcat page. by John Spurlock · 11 years ago
  71. 784aab7 am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs by Ricardo Cervera · 11 years ago
  72. 8e142bb am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs by Katie McCormick · 11 years ago
  73. 75985bb am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs by John Spurlock · 11 years ago
  74. 4f26139 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev by JP Abgrall · 11 years ago
  75. 7c2b162 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev by Chad Brubaker · 11 years ago
  76. 358eaa7 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev by Svetoslav · 11 years ago
  77. 70a0ea0 am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev by Adrian Roos · 11 years ago
  78. 46bfaa1 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  79. d498101 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev by Dianne Hackborn · 11 years ago
  80. 6adc960 am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev by Jeff Brown · 11 years ago
  81. 6d3d6c4 am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev by Zhihai Xu · 11 years ago
  82. 57080be am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev by Zhihai Xu · 11 years ago
  83. 63938750 am c0232642: am 629daddd: Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  84. c023264 am 629daddd: Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  85. 629dadd Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  86. c73991b Fix layoutlib build. by Narayan Kamath · 11 years ago
  87. 00c7d34 am ff89d589: Merge commit \'3b9de0a4\' into manualmerge by Craig Mautner · 11 years ago
  88. d8b1707 am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev by Jeff Brown · 11 years ago
  89. ff89d58 Merge commit '3b9de0a4' into manualmerge by Craig Mautner · 11 years ago
  90. 6ae4d53b resolved conflicts for merge of db3146c0 to klp-modular-dev by Jeff Brown · 11 years ago
  91. fd2f8d4 am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  92. 51b921d DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  93. 3b9de0a am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev by Craig Mautner · 11 years ago
  94. 00e12e6 am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev by Craig Mautner · 11 years ago
  95. a921d8b am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  96. 3217cc6 Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  97. 6cde6c7 am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev by Adam Powell · 11 years ago
  98. 41685ce am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev by Adam Powell · 11 years ago
  99. e4e6b3c am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago
  100. 21384fa am f3a2895a: Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago