Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / ff1a55a2078b0925b5ccc82fb6461a37b3b36a66
  1. ff1a55a Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev by Bill Yi · 7 years ago
  2. 6f40fc7 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 by Bill Yi · 7 years ago
  3. ea5b2a8 Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev by Bill Yi · 7 years ago
  4. 16e78b6 [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc by Bill Yi · 7 years ago
  5. da0d89b [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 by Bill Yi · 7 years ago
  6. a1f536e Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev by TreeHugger Robot · 7 years ago
  7. dd05e2d Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev by TreeHugger Robot · 7 years ago
  8. 023ae30 [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc by Android Build Merger (Role) · 7 years ago
  9. 0b7e5c3 [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd by Android Build Merger (Role) · 7 years ago
  10. fb5d173 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  11. 42e8a0c [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653 by Android Build Merger (Role) · 7 years ago
  12. baff683 [automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 by Android Build Merger (Role) · 7 years ago
  13. a451368 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  14. 7b73069 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639 by Android Build Merger (Role) · 7 years ago
  15. 2aaa34b [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 by Android Build Merger (Role) · 7 years ago
  16. 4c87ffe Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  17. bb0a801 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 skipped: aa9c801f89 by Siyamed Sinir · 7 years ago
  18. 1fd506a [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 skipped: aa9c801f89 by Android Build Merger (Role) · 7 years ago
  19. aa9c801 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 by Android Build Merger (Role) · 7 years ago
  20. 7db4a90 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f by Android Build Merger (Role) · 7 years ago
  21. fc98290 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 by Android Build Merger (Role) · 7 years ago
  22. d57766c [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 by Android Build Merger (Role) · 7 years ago
  23. 0a2ed3f [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 by Android Build Merger (Role) · 7 years ago
  24. 15a3e59 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 by Android Build Merger (Role) · 7 years ago
  25. 8572710 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a by Android Build Merger (Role) · 7 years ago
  26. 30a7058 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 by Android Build Merger (Role) · 7 years ago
  27. 84f311b [automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df by Etan Cohen · 7 years ago
  28. bd7573d [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 by Etan Cohen · 7 years ago
  29. 7c2ccdd [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 by Etan Cohen · 7 years ago
  30. 655059b Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev by Etan Cohen · 7 years ago
  31. fa6d41a [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b by Etan Cohen · 7 years ago
  32. b6eed22 Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev by Etan Cohen · 7 years ago
  33. a5802150 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645 by Etan Cohen · 7 years ago
  34. beef47b Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev by Etan Cohen · 7 years ago
  35. 03c97d0 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev by Etan Cohen · 7 years ago
  36. 7bd058e [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054 by Etan Cohen · 7 years ago
  37. f28aa65 Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr2-dev am: e12dda4b7c" into oc-dev by Etan Cohen · 7 years ago
  38. e7a0ce2 Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev by Etan Cohen · 7 years ago
  39. 2fe9543f [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d by Etan Cohen · 7 years ago
  40. a97fcf8 [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435 am: 484e2c4ea1 by Etan Cohen · 7 years ago
  41. efce54b Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev by Etan Cohen · 7 years ago
  42. c9be10b Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev by Etan Cohen · 7 years ago
  43. 72ec6ee Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev by Etan Cohen · 7 years ago
  44. ad8bae1 [automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df by Android Build Merger (Role) · 7 years ago
  45. 5a590c6 Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev by Etan Cohen · 7 years ago
  46. 9e5c212 Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev by Android Build Merger (Role) · 7 years ago
  47. d1e93e3 [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99 by Android Build Merger (Role) · 7 years ago
  48. 3979121 [automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 by Android Build Merger (Role) · 7 years ago
  49. 1aab54a Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev by Etan Cohen · 7 years ago
  50. bc7bb6c [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4 by Android Build Merger (Role) · 7 years ago
  51. d2428eb [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e by Android Build Merger (Role) · 7 years ago
  52. 0c8b408 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a by Android Build Merger (Role) · 7 years ago
  53. 363b273 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 by Android Build Merger (Role) · 7 years ago
  54. cdc187e Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev by Etan Cohen · 7 years ago
  55. d0adbcb Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev by Android Build Merger (Role) · 7 years ago
  56. f52e68c Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev by Etan Cohen · 7 years ago
  57. 1c49051 [automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da by Etan Cohen · 7 years ago
  58. 5c777fb [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b by Android Build Merger (Role) · 7 years ago
  59. 7f44406 [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d by Android Build Merger (Role) · 7 years ago
  60. 1d10387 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev by Etan Cohen · 7 years ago
  61. 8e5ec12 Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev by Android Build Merger (Role) · 7 years ago
  62. f9d12ab Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  63. c8c1b51 Merge "Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058" into cw-f-dev by Android Build Merger (Role) · 7 years ago
  64. 358bf6c Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f" into nyc-mr1-dev by Android Build Merger (Role) · 7 years ago
  65. 39e6bc7 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  66. 124da97 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev by Android Build Merger (Role) · 7 years ago
  67. 50be3c7 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7 by Android Build Merger (Role) · 7 years ago
  68. 457e844 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 by Android Build Merger (Role) · 7 years ago
  69. 3ba85c8 Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev by Etan Cohen · 7 years ago
  70. c9e1d84 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645 by Android Build Merger (Role) · 7 years ago
  71. 4839fb4 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev by Android Build Merger (Role) · 7 years ago
  72. 50d4e94 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev by Android Build Merger (Role) · 7 years ago
  73. 3d138f1 Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f" into nyc-dr1-dev by Android Build Merger (Role) · 7 years ago
  74. a3473d8 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  75. e79c03a Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev by Android Build Merger (Role) · 7 years ago
  76. 024efb4 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d by Android Build Merger (Role) · 7 years ago
  77. 651db18 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 by Android Build Merger (Role) · 7 years ago
  78. b164f1d Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev by Etan Cohen · 7 years ago
  79. bc3d103 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d am: f6d4304e95 by Android Build Merger (Role) · 7 years ago
  80. f6d4304 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d by Android Build Merger (Role) · 7 years ago
  81. 5e30c39 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 by Android Build Merger (Role) · 7 years ago
  82. fa72a62 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev by Android Build Merger (Role) · 7 years ago
  83. 827eb74 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev by Android Build Merger (Role) · 7 years ago
  84. bd629f6 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev by Android Build Merger (Role) · 7 years ago
  85. cfd2aec Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dr1-dev by Android Build Merger (Role) · 7 years ago
  86. 77b752e Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  87. cdd69c5 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into cw-f-dev by Android Build Merger (Role) · 7 years ago
  88. 6f10ae5 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 by Android Build Merger (Role) · 7 years ago
  89. e1ea5d3 Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev by Etan Cohen · 7 years ago
  90. 0d2044a Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev by Etan Cohen · 7 years ago
  91. aee1850 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372 am: 91d4d3db33 by Android Build Merger (Role) · 7 years ago
  92. 91d4d3d [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372 by Android Build Merger (Role) · 7 years ago
  93. 000e662 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054 by Android Build Merger (Role) · 7 years ago
  94. 247b4d5 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa by Android Build Merger (Role) · 7 years ago
  95. b26a010 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 by Android Build Merger (Role) · 7 years ago
  96. c290ad3 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb by Android Build Merger (Role) · 7 years ago
  97. 1746fb7 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a by Android Build Merger (Role) · 7 years ago
  98. 25b8c8b [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a by Android Build Merger (Role) · 7 years ago
  99. 74c421f [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 by Android Build Merger (Role) · 7 years ago
  100. af8b7b8 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c by Android Build Merger (Role) · 7 years ago