Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / e920322ff0c67cdd9e9682fd7c7df5221a6fb13e
  1. e920322 am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev by Mike Lockwood · 11 years ago
  2. 8611960 am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev by Mike Lockwood · 11 years ago
  3. aa7e396 am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev by Mike Lockwood · 11 years ago
  4. 935d417 am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev by Mike Lockwood · 11 years ago
  5. afc3a5d Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev by Mike Lockwood · 11 years ago
  6. 3b6689c am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  7. e781efd am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  8. f479d15 am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  9. bf05684 am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  10. 83b4ce7 am d5f3183e: am 1c84e98f: am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  11. 058061d Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  12. d5f3183 am 1c84e98f: am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  13. 1c84e98 am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  14. a6454cc am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  15. 4932530 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  16. d181673 Fix stopBatchedScan not working for wifi by Wei Wang · 11 years ago
  17. 13a2639 am 113847c3: am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  18. 113847c am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  19. 46b2664 am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  20. 7d09713 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  21. 7cd5289 am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  22. 5035fab am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  23. cecc620 am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  24. 759445c resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  25. ffb3e59 am bb7fdd6e: am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  26. bb7fdd6 am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  27. b876cae am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  28. 205a3ea Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" by Mike Lockwood · 11 years ago
  29. f92b007 am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  30. 52bc363 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  31. 5c43c35 am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  32. c2221b9 am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  33. ecf3c57 am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  34. 826f364 am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  35. d16505d Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  36. c53ad4c am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  37. 072e1da am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  38. b17cf20 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  39. a3633c2 am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" by Colin Cross · 11 years ago
  40. 9ee72b6 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  41. 665b075 am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  42. 71a3d40 am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" by Colin Cross · 11 years ago
  43. e4360c8 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" by Colin Cross · 11 years ago
  44. 4308a52 Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" by Colin Cross · 11 years ago
  45. 81fbdad resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  46. c5640ea am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  47. 51daba3 am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad by Scott Main · 11 years ago
  48. 34c40ca am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 by Wei Wang · 11 years ago
  49. 065b8fd am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  50. d4d42af am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad by Scott Main · 11 years ago
  51. 331ef61 am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 by Wei Wang · 11 years ago
  52. 534f3e9 am a3337bc7: Merge "Verify certificates" into jb-dev by Marco Nelissen · 11 years ago
  53. 8bc12a5 am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  54. df00735 am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad by Scott Main · 11 years ago
  55. 3277953 am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 by Wei Wang · 11 years ago
  56. a3337bc Merge "Verify certificates" into jb-dev by Marco Nelissen · 11 years ago
  57. 323d8ef am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  58. 43f8ed5 am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  59. 3017a01 am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  60. 09cb894 am 11e0ead8: am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev by Michael Wright · 11 years ago
  61. f503a2d Update contextual asset bar assets to avoid 9-patch artifacts by Adam Powell · 11 years ago
  62. 6c9385b am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  63. 8c5567e am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  64. e397d90 am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  65. 11e0ead81 am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev by Michael Wright · 11 years ago
  66. db2895e am 4eefde23: am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev by Chris Craik · 11 years ago
  67. 1d6c257 am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev by Jim Miller · 11 years ago
  68. 71422f7 am 1e0ae4fa: am ca58036d: am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  69. 4eefde2 am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev by Chris Craik · 11 years ago
  70. aebe3b6c am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev by Jim Miller · 11 years ago
  71. 1e0ae4f am ca58036d: am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  72. e28f061 am 76ae4b80: am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." by Narayan Kamath · 11 years ago
  73. 76ae4b8 am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." by Narayan Kamath · 11 years ago
  74. c850102 am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." by Narayan Kamath · 11 years ago
  75. 0da4ad4 Merge "Don't register methods when there's nothing to register." by Narayan Kamath · 11 years ago
  76. 5a510a2 am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  77. e02d5a2 am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad by Scott Main · 11 years ago
  78. 6398a86 Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  79. 21e3372 Point bitmaps training class to new samples directory. by Adam Koch · 11 years ago
  80. a32c437 update to wear docs. by Scott Main · 11 years ago
  81. 13bd857 am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 by Wei Wang · 11 years ago
  82. d10bc17 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  83. 15a18d0 am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  84. c0384b6 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 by Wei Wang · 11 years ago
  85. da08410 Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  86. bd33dc0 am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  87. e0683de am 37050124: am a413a4ae: Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  88. 99689a6 am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" by Chris Craik · 11 years ago
  89. 9208bb4 am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" by Chris Craik · 11 years ago
  90. 8e69abf am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  91. 00efaea am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" by Chris Craik · 11 years ago
  92. 46e6311 DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  93. dac2980 Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" by Chris Craik · 11 years ago
  94. 857fe51 am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot." by Nick Kralevich · 11 years ago
  95. 69e58e4 Merge "Add idc config option for handling key repeats" into klp-modular-dev by Michael Wright · 11 years ago
  96. 0b4f63c am dd6b7495: am 83725810: Merge "Get rid of noise during boot." by Nick Kralevich · 11 years ago
  97. a78b389 am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" by Colin Cross · 11 years ago
  98. 3705012 am a413a4ae: Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  99. dd6b749 am 83725810: Merge "Get rid of noise during boot." by Nick Kralevich · 11 years ago
  100. a413a4a Fix the build. DO NOT MERGE by Jim Miller · 11 years ago