Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 387f598ef95d0fe6850cbb902300ddad6d75ff67
  1. 387f598 resolved conflicts for merge of a3342991 to master by Craig Mautner · 10 years ago
  2. 0f2c90e Merge "Use activated control color for ripple checked state" by Alan Viverette · 10 years ago
  3. a334299 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev by Craig Mautner · 10 years ago
  4. 8076b5a8 Merge "Simplify and correct texture upload unpack alignment parameter" by Chris Craik · 10 years ago
  5. 07317da am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev by Craig Mautner · 10 years ago
  6. cbb286b Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev by Craig Mautner · 10 years ago
  7. 3117a528 Use activated control color for ripple checked state by Alan Viverette · 10 years ago
  8. 37424b3 Simplify and correct texture upload unpack alignment parameter by Chris Craik · 10 years ago
  9. a0d17f8 Merge "Update the javadoc for the clip path fix." by ztenghui · 10 years ago
  10. 025ac53 Merge "Fix NPE in ActionMenuView when there isn't a presenter" by Chris Banes · 10 years ago
  11. c643dda am 43df3c6c: am b5108949: am e4a031e3: Merge "New trick to install bad dex file." by Ying Wang · 10 years ago
  12. 43a8853 am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge: 554a6f5 by Adam Lesinski · 10 years ago
  13. 43df3c6 am b5108949: am e4a031e3: Merge "New trick to install bad dex file." by Ying Wang · 10 years ago
  14. 0c4d81c Do not defer removal for empty tasks or activities by Craig Mautner · 10 years ago
  15. d9bd088 am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge: 554a6f5 by Adam Lesinski · 10 years ago
  16. b510894 am e4a031e3: Merge "New trick to install bad dex file." by Ying Wang · 10 years ago
  17. 0fa1d70 am a9c122af: Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb automerge: 5afc62c by Christopher Tate · 10 years ago
  18. 554a6f5 am aee7225e: Merge "Process base APK" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  19. a9c122a Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb by Christopher Tate · 10 years ago
  20. e4a031e Merge "New trick to install bad dex file." by Ying Wang · 10 years ago
  21. aee7225 Merge "Process base APK" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  22. 5afc62c Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev by Christopher Tate · 10 years ago
  23. 7651dcb Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev by Christopher Tate · 10 years ago
  24. 885e727 am f5f54dd6: am 92dd1abe: Update restored task uid to match the package uid on current device. automerge: 7fd985f by Wale Ogunwale · 10 years ago
  25. f5f54dd am 92dd1abe: Update restored task uid to match the package uid on current device. by Wale Ogunwale · 10 years ago
  26. 7fd985f am 92dd1abe: Update restored task uid to match the package uid on current device. by Wale Ogunwale · 10 years ago
  27. d720ec1 Merge "Move Canvas" by John Reck · 10 years ago
  28. 92dd1ab Update restored task uid to match the package uid on current device. by Wale Ogunwale · 10 years ago
  29. 849911a Move Canvas by John Reck · 10 years ago
  30. b643624 New trick to install bad dex file. by Ying Wang · 10 years ago
  31. 63ae9f3 Merge "New trick to install bad dex file." by Ying Wang · 10 years ago
  32. e50c298 Merge "Don't read float from parcel" by Todd Kennedy · 10 years ago
  33. e1f183d Merge "Expose new binder call createStackOnDisplay()" by Todd Kennedy · 10 years ago
  34. e635f66 Don't read float from parcel by Todd Kennedy · 10 years ago
  35. 5b0d488 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c automerge: 046dc08 by Ricardo Cervera · 10 years ago
  36. 115759a am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c by Ricardo Cervera · 10 years ago
  37. 4900bf9 Expose new binder call createStackOnDisplay() by Todd Kennedy · 10 years ago
  38. 046dc08 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c by Ricardo Cervera · 10 years ago
  39. 7c002d7 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 by Ricardo Cervera · 10 years ago
  40. 47e274c am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 by Ricardo Cervera · 10 years ago
  41. 458f432 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 by Ricardo Cervera · 10 years ago
  42. eada048 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 by Ricardo Cervera · 10 years ago
  43. df8e59a am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." by Neil Fuller · 10 years ago
  44. 77e7f40 am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." by Neil Fuller · 10 years ago
  45. aa3a45b am 42c2ac00: Merge "Fix for broken docs build." by Neil Fuller · 10 years ago
  46. 42c2ac0 Merge "Fix for broken docs build." by Neil Fuller · 10 years ago
  47. ae69120 Fix for broken docs build. by Neil Fuller · 10 years ago
  48. 4c7ddab am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp by Neil Fuller · 10 years ago
  49. 7014da7 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp by Neil Fuller · 10 years ago
  50. 7382c02 am 00502e89: Merge "Changes associated with an OkHttp upgrade" by Neil Fuller · 10 years ago
  51. 00502e8 Merge "Changes associated with an OkHttp upgrade" by Neil Fuller · 10 years ago
  52. 50a01d8 Changes associated with an OkHttp upgrade by Neil Fuller · 10 years ago
  53. 1480108 Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  54. 6b5eedf Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  55. c732113 Merge "Update dpm command to follow --user convention." by Sudheer Shanka · 10 years ago
  56. d6fe549 am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." by Narayan Kamath · 10 years ago
  57. da1da67 am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." by Narayan Kamath · 10 years ago
  58. 66bbfb6 am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." by Narayan Kamath · 10 years ago
  59. a2a6a7d am bb0bb9ae: (-s ours) am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  60. 1f7d657 am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." by Narayan Kamath · 10 years ago
  61. 17f50f8 am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." by Narayan Kamath · 10 years ago
  62. e9a6f03 Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  63. 9563c9b Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  64. b3adc50 am 45ac66f4: (-s ours) am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  65. bb0bb9a am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  66. d8beca6 Merge "Remove support for --classpath and make --runtime-init the default." by Narayan Kamath · 10 years ago
  67. 8a28956 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  68. 45ac66f am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  69. 03488d2 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  70. 3e80979 am e315feea: Merge "Fix handling of wrapped processes [part 1]." by Narayan Kamath · 10 years ago
  71. f48029f Remove support for --classpath and make --runtime-init the default. by Narayan Kamath · 10 years ago
  72. e315fee Merge "Fix handling of wrapped processes [part 1]." by Narayan Kamath · 10 years ago
  73. c7f4582 am 2bc2a994: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  74. 2bc2a99 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  75. 6ac7e67 Fix handling of wrapped processes [part 1]. by Narayan Kamath · 10 years ago
  76. 5cd1326 Fix NPE in ActionMenuView when there isn't a presenter by Chris Banes · 10 years ago
  77. 2e139d5 am e05f269b: am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" by Narayan Kamath · 10 years ago
  78. e05f269 am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" by Narayan Kamath · 10 years ago
  79. 96b87a1 am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" by Narayan Kamath · 10 years ago
  80. 4ac5775d Merge "Fix handling of wrapped processes [part 2]" by Narayan Kamath · 10 years ago
  81. f614a9f am 1951fc36: am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL by Jinsuk Kim · 10 years ago
  82. 22443c9 am a73cbece: am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  83. 1951fc3 am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL by Jinsuk Kim · 10 years ago
  84. a73cbec am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  85. d38f077 am 5b8cb00b: CEC: Process new options for CEC/MHL HAL by Jinsuk Kim · 10 years ago
  86. 4d37a35 am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  87. 5b8cb00 CEC: Process new options for CEC/MHL HAL by Jinsuk Kim · 10 years ago
  88. bbfec56 Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  89. d47abef CEC: Make TV try to allocate logical address 0 first by Jinsuk Kim · 10 years ago
  90. c0fa70e am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev by Sanket Padawe · 10 years ago
  91. 60b41e6aa am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev by Sanket Padawe · 10 years ago
  92. 543348e am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev by Sanket Padawe · 10 years ago
  93. d2dd69a Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev by Sanket Padawe · 10 years ago
  94. bd74a70 am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs by Scott Rowe · 10 years ago
  95. 9d6f65e am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs by Scott Rowe · 10 years ago
  96. cee634d am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs by Scott Rowe · 10 years ago
  97. ec015c5 am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs by Scott Rowe · 10 years ago
  98. 11ce4b7 am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs by Scott Rowe · 10 years ago
  99. e019bbb1 am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs by Scott Rowe · 10 years ago
  100. c68ab86 am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs by Scott Rowe · 10 years ago