Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 7b409ed9cea0e5b75e9a727cbd1cd15e99b5cc95
  1. 7b409ed [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f am: 176758a8cb -s ours by Bill Yi · 6 years ago
  2. c9bdb75 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b4472 by Bill Yi · 6 years ago
  3. d874997 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours by Bill Yi · 6 years ago
  4. 1da1b80 [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f by Bill Yi · 6 years ago
  5. d72f7d1 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev by Bill Yi · 6 years ago
  6. 94c6fa9 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 by Bill Yi · 6 years ago
  7. e138bd2 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours by Bill Yi · 6 years ago
  8. 5c7f0c4 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 by Bill Yi · 6 years ago
  9. ef0d8b4 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev by TreeHugger Robot · 6 years ago
  10. 176758a [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f by Android Build Merger (Role) · 6 years ago
  11. 985e4a2 [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed by Android Build Merger (Role) · 6 years ago
  12. c82e0b3 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  13. 09f4f73 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 by Android Build Merger (Role) · 6 years ago
  14. 7176023 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 by Android Build Merger (Role) · 6 years ago
  15. 5739e3b Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  16. 236da59 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 by Android Build Merger (Role) · 6 years ago
  17. 84b233f [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 by Android Build Merger (Role) · 6 years ago
  18. eadf247 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  19. e30c42e [automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev by Steve Elliott · 6 years ago
  20. d2fa9c3 DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev by Steve Elliott · 6 years ago
  21. d5bed0f DO NOT MERGE: Add configurable default setting for assistant componentname by Steve Elliott · 6 years ago
  22. 77c1f60 DO NOT MERGE: Add configurable default setting for assistant componentname by Steve Elliott · 6 years ago
  23. 7656e11 Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c by Jeff Sharkey · 6 years ago
  24. cef9bae [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 by Jeff Sharkey · 6 years ago
  25. 893598c Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 6 years ago
  26. 80c65f6 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac by Jeff Sharkey · 6 years ago
  27. ab80221 Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 6 years ago
  28. a1ec7b1 RESTRICT AUTOMERGE: Recover shady content:// paths. by Jeff Sharkey · 6 years ago
  29. af72f01 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac by Android Build Merger (Role) · 6 years ago
  30. 50e06f2 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 by Android Build Merger (Role) · 6 years ago
  31. ae30765 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac by Android Build Merger (Role) · 6 years ago
  32. 6ef77ae [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c by Android Build Merger (Role) · 6 years ago
  33. 010585f [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd by Android Build Merger (Role) · 6 years ago
  34. 301d17e RESTRICT AUTOMERGE: Recover shady content:// paths. by Jeff Sharkey · 6 years ago
  35. 95fe3f8 [automerger skipped] resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev by Wayne Lin · 6 years ago
  36. fd6df00 resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev by Wayne Lin · 6 years ago
  37. a526511 Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev am: 57b2e38837 by Bill Yi · 6 years ago
  38. 9577eeb [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 am: 0bc949205b -s ours by Bill Yi · 6 years ago
  39. 06908ed Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev am: 33be0d800a by Bill Yi · 6 years ago
  40. def9e59 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 am: fd474f8dc8 -s ours by Bill Yi · 6 years ago
  41. 099172c Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev am: eb92e99a06 by Bill Yi · 6 years ago
  42. 1046cb2 [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 am: 5bf6376615 -s ours by Bill Yi · 6 years ago
  43. 1eaac3c Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev am: 1825d87bc7 by Bill Yi · 6 years ago
  44. 2fa3244 [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a am: 77b862002b -s ours by Bill Yi · 6 years ago
  45. 450459b Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev am: 8c53c6e4e3 by Bill Yi · 6 years ago
  46. b0720ae [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 am: 2053a11236 -s ours by Bill Yi · 6 years ago
  47. 6c2376c Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by Bill Yi · 6 years ago
  48. 318224a [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Bill Yi · 6 years ago
  49. e90b1d1 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by Bill Yi · 6 years ago
  50. 3cd4a34 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Bill Yi · 6 years ago
  51. dc3d2a5 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev am: d349bd741d by Bill Yi · 6 years ago
  52. 9a953b1 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by Bill Yi · 6 years ago
  53. f7ee9f3f [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Bill Yi · 6 years ago
  54. 3e8f4b1 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 am: 1e00122904 -s ours by Bill Yi · 6 years ago
  55. c270ca1 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by Bill Yi · 6 years ago
  56. 36e63c9 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev am: 0adf6e1981 by Bill Yi · 6 years ago
  57. 4c4783d [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a by Bill Yi · 6 years ago
  58. fb6c9eb [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae am: 997014d63a -s ours by Bill Yi · 6 years ago
  59. a7bdac8 Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by Bill Yi · 6 years ago
  60. ed50f64 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Bill Yi · 6 years ago
  61. cf751f2 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by Bill Yi · 6 years ago
  62. 1ac05df [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d am: 20ce1f4c33 -s ours by Bill Yi · 6 years ago
  63. 8efa418 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 by Bill Yi · 6 years ago
  64. 6b2064e Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by Bill Yi · 6 years ago
  65. b551c79 [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae by Bill Yi · 6 years ago
  66. 2e250a6 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d by Bill Yi · 6 years ago
  67. 3afd4ae Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev by Wayne Lin · 6 years ago
  68. 976625d Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  69. 10a7c3d Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  70. 57b2e38 Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by TreeHugger Robot · 6 years ago
  71. 33be0d8 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by TreeHugger Robot · 6 years ago
  72. a72a699 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  73. db7a1ef Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  74. eb92e99 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by TreeHugger Robot · 6 years ago
  75. f298b72 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  76. fb13c21 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  77. 1825d87 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by TreeHugger Robot · 6 years ago
  78. becac79 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  79. 3788fea Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  80. 8c53c6e Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by TreeHugger Robot · 6 years ago
  81. 1fca2d7 Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  82. a980db0 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  83. d349bd7 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by TreeHugger Robot · 6 years ago
  84. 7599a21 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  85. 3e52894 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  86. 0adf6e1 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by TreeHugger Robot · 6 years ago
  87. fbfd66a Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  88. a4b8875 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 6 years ago
  89. 5194d05 [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control by Wayne Lin · 6 years ago
  90. 5bf6376 [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Android Build Merger (Role) · 6 years ago
  91. ebf64fa [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 by Android Build Merger (Role) · 6 years ago
  92. 4310d4d Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  93. 2053a11 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Android Build Merger (Role) · 6 years ago
  94. f487edc [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 by Android Build Merger (Role) · 6 years ago
  95. f6e12d6 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  96. fd474f8 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Android Build Merger (Role) · 6 years ago
  97. b5f8896 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 by Android Build Merger (Role) · 6 years ago
  98. 73a5116 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  99. 0bc9492 [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Android Build Merger (Role) · 6 years ago
  100. 853c7ca [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 by Android Build Merger (Role) · 6 years ago