Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / d2eb52dd7bc9df0aded23850c87f3ac50a59f76e
  1. d2eb52d Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev by Bill Yi · 7 years ago
  2. 497cb6d [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a by Bill Yi · 7 years ago
  3. fefdff3 Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev by Bill Yi · 7 years ago
  4. 82f5bd6 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 by Bill Yi · 7 years ago
  5. 51ec5967 Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev by Bill Yi · 7 years ago
  6. 519fa54 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 by Bill Yi · 7 years ago
  7. 8b1df08 Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev by Bill Yi · 7 years ago
  8. 1da1b80 [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f by Bill Yi · 7 years ago
  9. d72f7d1 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev by Bill Yi · 7 years ago
  10. 94c6fa9 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 by Bill Yi · 7 years ago
  11. cfbf7a2 Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev by TreeHugger Robot · 7 years ago
  12. 5c7f0c4 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 by Bill Yi · 7 years ago
  13. 8c5514b Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev by TreeHugger Robot · 7 years ago
  14. 3fa917c Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev by TreeHugger Robot · 7 years ago
  15. 568344a Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev by TreeHugger Robot · 7 years ago
  16. ef0d8b4 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev by TreeHugger Robot · 7 years ago
  17. 176758a [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f by Android Build Merger (Role) · 7 years ago
  18. 985e4a2 [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed by Android Build Merger (Role) · 7 years ago
  19. c82e0b3 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  20. 09f4f73 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 by Android Build Merger (Role) · 7 years ago
  21. 7176023 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 by Android Build Merger (Role) · 7 years ago
  22. 5739e3b Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  23. cbaf150 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 by Android Build Merger (Role) · 7 years ago
  24. d9cf1de [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 by Android Build Merger (Role) · 7 years ago
  25. cfd1e14 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  26. 236da59 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 by Android Build Merger (Role) · 7 years ago
  27. 84b233f [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 by Android Build Merger (Role) · 7 years ago
  28. eadf247 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  29. 39a2390 [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a by Android Build Merger (Role) · 7 years ago
  30. 38e04d8 [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 by Android Build Merger (Role) · 7 years ago
  31. faba866 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  32. 204f727 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 by Android Build Merger (Role) · 7 years ago
  33. 79dc3a3 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 by Android Build Merger (Role) · 7 years ago
  34. 65cfd97 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  35. d2fa9c3 DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev by Steve Elliott · 7 years ago
  36. 77c1f60 DO NOT MERGE: Add configurable default setting for assistant componentname by Steve Elliott · 7 years ago
  37. 893598c Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 7 years ago
  38. 80c65f6 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac by Jeff Sharkey · 7 years ago
  39. ab80221 Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 7 years ago
  40. a1ec7b1 RESTRICT AUTOMERGE: Recover shady content:// paths. by Jeff Sharkey · 7 years ago
  41. af72f01 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac by Android Build Merger (Role) · 7 years ago
  42. 50e06f2 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 by Android Build Merger (Role) · 7 years ago
  43. ae30765 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac by Android Build Merger (Role) · 7 years ago
  44. 6ef77ae [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c by Android Build Merger (Role) · 7 years ago
  45. 010585f [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd by Android Build Merger (Role) · 7 years ago
  46. 301d17e RESTRICT AUTOMERGE: Recover shady content:// paths. by Jeff Sharkey · 7 years ago
  47. fd6df00 resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev by Wayne Lin · 7 years ago
  48. 6c2376c Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by Bill Yi · 7 years ago
  49. 318224a [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Bill Yi · 7 years ago
  50. e90b1d1 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by Bill Yi · 7 years ago
  51. 3cd4a34 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Bill Yi · 7 years ago
  52. 9a953b1 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by Bill Yi · 7 years ago
  53. f7ee9f3f [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Bill Yi · 7 years ago
  54. c270ca1 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by Bill Yi · 7 years ago
  55. 4c4783d [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a by Bill Yi · 7 years ago
  56. a7bdac8 Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by Bill Yi · 7 years ago
  57. ed50f64 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Bill Yi · 7 years ago
  58. cf751f2 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by Bill Yi · 7 years ago
  59. 8efa418 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 by Bill Yi · 7 years ago
  60. 6b2064e Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by Bill Yi · 7 years ago
  61. b551c79 [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae by Bill Yi · 7 years ago
  62. 2e250a6 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d by Bill Yi · 7 years ago
  63. 3afd4ae Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev by Wayne Lin · 7 years ago
  64. 976625d Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  65. 10a7c3d Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  66. 57b2e38 Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by TreeHugger Robot · 7 years ago
  67. 33be0d8 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by TreeHugger Robot · 7 years ago
  68. a72a699 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  69. db7a1ef Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  70. eb92e99 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by TreeHugger Robot · 7 years ago
  71. f298b72 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  72. fb13c21 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  73. 1825d87 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by TreeHugger Robot · 7 years ago
  74. becac79 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  75. 3788fea Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  76. 8c53c6e Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by TreeHugger Robot · 7 years ago
  77. 1fca2d7 Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  78. a980db0 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  79. d349bd7 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by TreeHugger Robot · 7 years ago
  80. 7599a21 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  81. 3e52894 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  82. 0adf6e1 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by TreeHugger Robot · 7 years ago
  83. fbfd66a Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  84. a4b8875 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  85. 5194d05 [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control by Wayne Lin · 7 years ago
  86. 5bf6376 [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Android Build Merger (Role) · 7 years ago
  87. ebf64fa [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 by Android Build Merger (Role) · 7 years ago
  88. 4310d4d Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  89. 2053a11 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Android Build Merger (Role) · 7 years ago
  90. f487edc [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 by Android Build Merger (Role) · 7 years ago
  91. f6e12d6 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  92. fd474f8 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Android Build Merger (Role) · 7 years ago
  93. b5f8896 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 by Android Build Merger (Role) · 7 years ago
  94. 73a5116 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  95. 0bc9492 [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Android Build Merger (Role) · 7 years ago
  96. 853c7ca [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 by Android Build Merger (Role) · 7 years ago
  97. f4b2cb1 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  98. 1e00122 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 by Android Build Merger (Role) · 7 years ago
  99. 5883bd3 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 by Android Build Merger (Role) · 7 years ago
  100. b19a62b Import translations. DO NOT MERGE by Bill Yi · 7 years ago