Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 5f7cdba8abe1845afd83c7ee5337f33d736c2ce3
  1. 5f7cdba Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev by TreeHugger Robot · 7 years ago
  2. e15cb62 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours skipped: 705235ca51 by Android Build Merger (Role) · 7 years ago
  3. 705235c Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours by Bill Yi · 7 years ago
  4. 7e0d93a6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours skipped: 6ad3912399 by Android Build Merger (Role) · 7 years ago
  5. 6ad3912 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours by Bill Yi · 7 years ago
  6. 0e2501d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5 -s ours skipped: 03ed0985ef by Android Build Merger (Role) · 7 years ago
  7. 03ed098 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5 -s ours by Bill Yi · 7 years ago
  8. dbdfba9 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev am: a22445abae -s ours" into oc-dev by Android Build Merger (Role) · 7 years ago
  9. 619a703 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  10. 6866408 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e -s ours skipped: 0534420c5d by Android Build Merger (Role) · 7 years ago
  11. 0534420 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e -s ours by Bill Yi · 7 years ago
  12. 066be5e Merge "Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev am: 2d947206f7" into oc-dev by Android Build Merger (Role) · 7 years ago
  13. 77740c0 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  14. 5cd6875 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours skipped: 7f649e7e6d by Android Build Merger (Role) · 7 years ago
  15. 7f649e7 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours by Bill Yi · 7 years ago
  16. a22445a Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  17. 350fc5d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours skipped: d855899adb by Android Build Merger (Role) · 7 years ago
  18. d855899 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours by Bill Yi · 7 years ago
  19. 41ee278 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  20. 2d94720 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  21. 11c37d0 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev by TreeHugger Robot · 7 years ago
  22. fb8b2af Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  23. 7b9a09d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours skipped: d6eb3dbf4b by Android Build Merger (Role) · 7 years ago
  24. 407d338 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  25. 84e21f34 Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  26. 6367f81 Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev by TreeHugger Robot · 7 years ago
  27. d6eb3db Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours by Bill Yi · 7 years ago
  28. 16b6bdf Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  29. 6a445d1 Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  30. eb9a92f Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev by TreeHugger Robot · 7 years ago
  31. 28815c5 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  32. c6762c9 Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  33. bcf3392 Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev by TreeHugger Robot · 7 years ago
  34. d6df52e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  35. 69ef1eb Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  36. f310c79 Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev by TreeHugger Robot · 7 years ago
  37. 1d77757 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  38. c69c4e5 Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  39. 806b457 Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev by TreeHugger Robot · 7 years ago
  40. 0fa3646 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  41. a0276bf Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  42. 41ae4b7 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev by TreeHugger Robot · 7 years ago
  43. d7b199b [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 by Android Build Merger (Role) · 7 years ago
  44. 2e4c69a [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb by Android Build Merger (Role) · 7 years ago
  45. 39a33e2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  46. 77243e2 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 by Android Build Merger (Role) · 7 years ago
  47. 10f8c98 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb by Android Build Merger (Role) · 7 years ago
  48. 9a738ccc Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  49. a9d6432 [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199 by Android Build Merger (Role) · 7 years ago
  50. e0e084e [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 by Android Build Merger (Role) · 7 years ago
  51. 816ddbd Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  52. 387047a [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 by Android Build Merger (Role) · 7 years ago
  53. ccc16f9 [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 by Android Build Merger (Role) · 7 years ago
  54. aa7eca2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  55. 0a09cd4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb by Android Build Merger (Role) · 7 years ago
  56. 03130e4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 by Android Build Merger (Role) · 7 years ago
  57. 4cd0777 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  58. 6f59280 [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 by Android Build Merger (Role) · 7 years ago
  59. 1a68c01 [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 by Android Build Merger (Role) · 7 years ago
  60. 4f9f892 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  61. 8eb39fb [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd by Android Build Merger (Role) · 7 years ago
  62. 218841a [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 by Android Build Merger (Role) · 7 years ago
  63. 2c3e611 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  64. 19f0813 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 by Android Build Merger (Role) · 7 years ago
  65. a14fb25 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 by Android Build Merger (Role) · 7 years ago
  66. e34cac0 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  67. cee1250 RESTRICT AUTOMERGE Preventing recursive referrence in drawables by Sunny Goyal · 7 years ago
  68. 48df033 Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev by TreeHugger Robot · 7 years ago
  69. d195a99 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e by Kevin Hufnagle · 7 years ago
  70. 7cb6513 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours by Bill Yi · 7 years ago
  71. 0a1948e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours by Bill Yi · 7 years ago
  72. 45d9622 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  73. b6dab6b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours by Bill Yi · 7 years ago
  74. f1c75d6 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours by Bill Yi · 7 years ago
  75. bd14c44 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours by Bill Yi · 7 years ago
  76. c344f9b1 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours by Bill Yi · 7 years ago
  77. ea2e302 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours by Bill Yi · 7 years ago
  78. d212114 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours by Bill Yi · 7 years ago
  79. d5a7fae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours by Bill Yi · 7 years ago
  80. 2c97ca3 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours by Bill Yi · 7 years ago
  81. 51fc07a Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours by Bill Yi · 7 years ago
  82. 0bfcd7e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours by Bill Yi · 7 years ago
  83. 81b98ff Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  84. 599fb37 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  85. e1ca34b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  86. 7ce772e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  87. 5943ef2 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours by Bill Yi · 7 years ago
  88. 05e41d0 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours by Bill Yi · 7 years ago
  89. a683975 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours by Bill Yi · 7 years ago
  90. e135a35 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours by Bill Yi · 7 years ago
  91. 7244723 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours by Bill Yi · 7 years ago
  92. 13062c9 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours by Bill Yi · 7 years ago
  93. 2d00ab6 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours by Bill Yi · 7 years ago
  94. c81e5ae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours by Bill Yi · 7 years ago
  95. daa1d87 Import translations. DO NOT MERGE am: 406659b709 -s ours by Bill Yi · 7 years ago
  96. 1f204cd Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  97. 970261b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  98. 9593ca1 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  99. 1fccf16 Import translations. DO NOT MERGE am: 406659b709 -s ours by Bill Yi · 7 years ago
  100. 0c1f4c2 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago