Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 698e044717e1106bbd8a63798b062a9d31e9ddb1
  1. 698e044 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e by fionaxu · 9 years ago
  2. 965084d resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e by fionaxu · 9 years ago
  3. 1e8fe12 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e by fionaxu · 9 years ago
  4. c196526 resolve merge conflicts of 2c53526 to lmp-mr1-dev by fionaxu · 9 years ago
  5. 2c53526 Backport loadSafeLabel changes am: be2865a60a am: 4c50846519 am: 9a825b0fd5 by fionaxu · 9 years ago
  6. 9a825b0 Backport loadSafeLabel changes am: be2865a60a am: 4c50846519 by fionaxu · 9 years ago
  7. 4c50846 Backport loadSafeLabel changes am: be2865a60a by fionaxu · 9 years ago
  8. be2865a Backport loadSafeLabel changes by fionaxu · 9 years ago
  9. 54a62d5 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 by Paul Jensen · 9 years ago
  10. 7c625e1 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 by Paul Jensen · 9 years ago
  11. 75095e6 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 by Paul Jensen · 9 years ago
  12. 42a5983 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 by Paul Jensen · 9 years ago
  13. 6c35cf2 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff by Paul Jensen · 9 years ago
  14. bb27626 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff by Paul Jensen · 9 years ago
  15. 8940d2b Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev by Paul Jensen · 9 years ago
  16. af0b446 Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev by Paul Jensen · 9 years ago
  17. 88c9eae DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade by Christopher Tate · 9 years ago
  18. 24ceca9 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 by Christopher Tate · 9 years ago
  19. 4c559cd DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours by Christopher Tate · 9 years ago
  20. 077534b DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours by Christopher Tate · 9 years ago
  21. 2cfc6ba Merge "Backport of backup transport whitelist" into mnc-dev by Chris Tate · 9 years ago
  22. 2be3de1 Backport of backup transport whitelist by Christopher Tate · 9 years ago
  23. 45c77d9 Merge "Fix missing permission check when saving pattern/password" into mnc-dev by Jim Miller · 9 years ago
  24. 647cb6a DO NOT MERGE : backport of backup transport whitelist by Christopher Tate · 9 years ago
  25. a789572 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 by John Reck · 9 years ago
  26. 8238207 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d by John Reck · 9 years ago
  27. 1da8c9b DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours by John Reck · 9 years ago
  28. 1fae3b3 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours by John Reck · 9 years ago
  29. bfa719f DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 by John Reck · 9 years ago
  30. 5527fd1 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 by John Reck · 9 years ago
  31. 1b1fcba DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 by John Reck · 9 years ago
  32. 7c9f2b8 DO NOT MERGE Cherry pick libpng usage fixes by John Reck · 12 years ago
  33. 82b9565 Backport ChooserTarget package source check from N by Adam Powell · 9 years ago
  34. 08ec0e5 Don't pass URL path and username/password to PAC scripts by Paul Jensen · 9 years ago
  35. b538345 Fix missing permission check when saving pattern/password by Jim Miller · 9 years ago
  36. 825b713 resolve merge conflicts of 44e07e0 to mnc-dev by Christopher Tate · 9 years ago
  37. 44e07e0 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev by Christopher Tate · 9 years ago
  38. 5e380f0 resolve merge conflicts of 7641889 to lmp-mr1-dev am: cebcde3b5a by Christopher Tate · 9 years ago
  39. cebcde3 resolve merge conflicts of 7641889 to lmp-mr1-dev by Christopher Tate · 9 years ago
  40. 7641889 Kill the real/isolated uid group, not the ApplicationInfo uid by Christopher Tate · 9 years ago
  41. 224582e0 Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev by Michael Wright · 9 years ago
  42. 3bdb89b DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 by Todd Kennedy · 9 years ago
  43. e265f35 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed by Todd Kennedy · 9 years ago
  44. be58fe0 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours by Todd Kennedy · 9 years ago
  45. 620a4ed DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours by Todd Kennedy · 9 years ago
  46. d73c865 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 by Todd Kennedy · 9 years ago
  47. c2cc804 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 by Todd Kennedy · 9 years ago
  48. a73fa08 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c by Todd Kennedy · 9 years ago
  49. ca13384 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 by Todd Kennedy · 9 years ago
  50. 6e0aff3 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c by Todd Kennedy · 9 years ago
  51. ebb136c DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours by Todd Kennedy · 9 years ago
  52. 3dfc6d9 DO NOT MERGE Fix intent filter priorities am: 60351d3 by Todd Kennedy · 9 years ago
  53. 60351d3 DO NOT MERGE Fix intent filter priorities by Todd Kennedy · 9 years ago
  54. eeb970a DO NOT MERGE Fix intent filter priorities by Todd Kennedy · 9 years ago
  55. d6174e7 DO NOT MERGE Fix intent filter priorities by Todd Kennedy · 9 years ago
  56. 0625e11 Add new, hidden MotionEvent flag for partially obscured windows. by Michael Wright · 9 years ago
  57. 1450b69 [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 by Samuel Tan · 9 years ago
  58. f4fd201 [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab by Samuel Tan · 9 years ago
  59. 3253022 [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours by Samuel Tan · 9 years ago
  60. c2712ab [DO NOT MERGE] Disallow guest user from changing Wifi settings by Samuel Tan · 9 years ago
  61. d385a6d [DO NOT MERGE] Disallow guest user from changing Wifi settings by Samuel Tan · 9 years ago
  62. d8c3ca4 [DO NOT MERGE] Disallow guest user from changing Wifi settings by Samuel Tan · 9 years ago
  63. 2033917 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b by Shreyas Basarge · 9 years ago
  64. 4aa7855 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 by Shreyas Basarge · 9 years ago
  65. 242bdb6 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d by Shreyas Basarge · 9 years ago
  66. 5e4e02b NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 by Shreyas Basarge · 9 years ago
  67. 6fc321a NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 by Shreyas Basarge · 9 years ago
  68. eec587e NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 by Shreyas Basarge · 9 years ago
  69. 58048c1 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 by Shreyas Basarge · 9 years ago
  70. 339c4f2 NPE fix for SyncStorageEngine read authority am: a962d9eba7 by Shreyas Basarge · 9 years ago
  71. a962d9e NPE fix for SyncStorageEngine read authority by Shreyas Basarge · 9 years ago
  72. 5cb2597 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 by Matthew Williams · 10 years ago
  73. 1f6dbd9 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 by Matthew Williams · 10 years ago
  74. 9e52b29 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours by Matthew Williams · 10 years ago
  75. a76208d DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a by Matthew Williams · 10 years ago
  76. 9c84192 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours by Matthew Williams · 10 years ago
  77. 0d3e463 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 by Matthew Williams · 10 years ago
  78. 5fc753a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 by Matthew Williams · 10 years ago
  79. 06ef7df DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 by Matthew Williams · 10 years ago
  80. a5cafd2 DO NOT MERGE Redact Account info from getCurrentSyncs by Matthew Williams · 10 years ago
  81. 0f29214 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e by Matthew Williams · 10 years ago
  82. a947baa Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb by Matthew Williams · 10 years ago
  83. be136b7 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 by Matthew Williams · 10 years ago
  84. 0e7cd0a Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 by Matthew Williams · 10 years ago
  85. 1a0aed3 Redact Account info from getCurrentSyncs am: f39549e389 by Matthew Williams · 10 years ago
  86. f39549e Redact Account info from getCurrentSyncs by Matthew Williams · 10 years ago
  87. 73992ae Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  88. 66841a6 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  89. 376082a Revert "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  90. 14c37a5 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours by Geoff Mendal · 10 years ago
  91. b409a99 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours by Geoff Mendal · 10 years ago
  92. 009fb75 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours by Geoff Mendal · 10 years ago
  93. 4df8f4a Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours by Geoff Mendal · 10 years ago
  94. 8874f97 Revert "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  95. 8ea5859 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours by Geoff Mendal · 10 years ago
  96. 42692af Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours by Geoff Mendal · 10 years ago
  97. 83bf32e Import translations. DO NOT MERGE am: 9f9e736e0d -s ours by Geoff Mendal · 10 years ago
  98. b441c69 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours by Geoff Mendal · 10 years ago
  99. 9f9e736 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  100. bc3b9e2 Import translations. DO NOT MERGE am: a4505e9264 -s ours by Geoff Mendal · 10 years ago