Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 94b7fafc69bff06402d1c4f587ee17dfc3fe251a
  1. 94b7faf Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev by Android Build Merger (Role) · 7 years ago
  2. a8e2306 [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd by Android Build Merger (Role) · 7 years ago
  3. 981bc5a Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev by Android Build Merger (Role) · 7 years ago
  4. cd4371f [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb by Android Build Merger (Role) · 7 years ago
  5. 6c1ecb9 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev by Android Build Merger (Role) · 7 years ago
  6. 114cd10 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 by Android Build Merger (Role) · 7 years ago
  7. fa70de8 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 by Android Build Merger (Role) · 7 years ago
  8. f310c79 Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev by TreeHugger Robot · 7 years ago
  9. 806b457 Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev by TreeHugger Robot · 7 years ago
  10. 41ae4b7 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev by TreeHugger Robot · 7 years ago
  11. 77243e2 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 by Android Build Merger (Role) · 7 years ago
  12. 10f8c98 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb by Android Build Merger (Role) · 7 years ago
  13. 9a738ccc Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  14. 0a09cd4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb by Android Build Merger (Role) · 7 years ago
  15. 03130e4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 by Android Build Merger (Role) · 7 years ago
  16. 4cd0777 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  17. 8eb39fb [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd by Android Build Merger (Role) · 7 years ago
  18. 218841a [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 by Android Build Merger (Role) · 7 years ago
  19. 2c3e611 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  20. 19f0813 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 by Android Build Merger (Role) · 7 years ago
  21. a14fb25 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 by Android Build Merger (Role) · 7 years ago
  22. e34cac0 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  23. 9b90490 [automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a by Android Build Merger (Role) · 7 years ago
  24. cee1250 RESTRICT AUTOMERGE Preventing recursive referrence in drawables by Sunny Goyal · 7 years ago
  25. 69d240d 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 Hyunyoung Song · 7 years ago
  26. 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
  27. 800e061 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. by Kevin Hufnagle · 7 years ago
  28. d195a99 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e by Kevin Hufnagle · 7 years ago
  29. 3a8be1a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  30. f0687d1 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours by Bill Yi · 7 years ago
  31. 7cb6513 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours by Bill Yi · 7 years ago
  32. 0a1948e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours by Bill Yi · 7 years ago
  33. 45d9622 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  34. 1f9ae3b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am: ea2e302eff -s ours by Bill Yi · 7 years ago
  35. b6dab6b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours by Bill Yi · 7 years ago
  36. b7a560f Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am: d21211470c -s ours by Bill Yi · 7 years ago
  37. f6c335b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am: d5a7faea83 -s ours by Bill Yi · 7 years ago
  38. 39d480e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am: 51fc07ad61 -s ours by Bill Yi · 7 years ago
  39. f1c75d6 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours by Bill Yi · 7 years ago
  40. 934729c Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am: 5943ef281a -s ours by Bill Yi · 7 years ago
  41. bd14c44 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours by Bill Yi · 7 years ago
  42. c344f9b1 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours by Bill Yi · 7 years ago
  43. ea2e302 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours by Bill Yi · 7 years ago
  44. d212114 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours by Bill Yi · 7 years ago
  45. f123f22 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours by Bill Yi · 7 years ago
  46. d5a7fae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours by Bill Yi · 7 years ago
  47. 2c97ca3 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours by Bill Yi · 7 years ago
  48. 7baaa51 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am: 7244723549 -s ours by Bill Yi · 7 years ago
  49. 51fc07a Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours by Bill Yi · 7 years ago
  50. 0bfcd7e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours by Bill Yi · 7 years ago
  51. 301dfae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am: 2d00ab621a -s ours by Bill Yi · 7 years ago
  52. bf2d4c7 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  53. 81b98ff Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  54. 599fb37 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  55. e1ca34b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  56. 7ce772e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  57. 5943ef2 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours by Bill Yi · 7 years ago
  58. 05e41d0 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours by Bill Yi · 7 years ago
  59. 25d7b57 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am: c81e5ae281 -s ours by Bill Yi · 7 years ago
  60. a683975 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours by Bill Yi · 7 years ago
  61. e135a35 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours by Bill Yi · 7 years ago
  62. 7244723 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours by Bill Yi · 7 years ago
  63. 13062c9 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours by Bill Yi · 7 years ago
  64. 2d00ab6 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours by Bill Yi · 7 years ago
  65. 0e62ea2 Import translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours by Bill Yi · 7 years ago
  66. c81e5ae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours by Bill Yi · 7 years ago
  67. daa1d87 Import translations. DO NOT MERGE am: 406659b709 -s ours by Bill Yi · 7 years ago
  68. 1f204cd Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  69. 970261b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  70. 9593ca1 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  71. 1fccf16 Import translations. DO NOT MERGE am: 406659b709 -s ours by Bill Yi · 7 years ago
  72. 0c1f4c2 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  73. 496af86 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  74. 535d958 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  75. 9e967d1 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  76. bb9f50e Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  77. 6e1b59c Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  78. 48f7a99 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  79. c503b8f Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  80. c06ca46 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  81. f2b9a60 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  82. 7bb5638 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  83. 406659b Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  84. 45e18b8 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  85. 4a8d9b6 Proper autofill fix to let phone process autofill Settings activity. by Felipe Leme · 7 years ago
  86. 2f58b03 Proper autofill fix to let phone process autofill Settings activity. by Felipe Leme · 7 years ago
  87. d62d687 Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev by Felipe Leme · 7 years ago
  88. bd355db Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev by TreeHugger Robot · 7 years ago
  89. 9ad2900 Make sure apps cannot forge package name on AssistStructure used for Autofill. by Felipe Leme · 7 years ago
  90. 59f44d3 resolve merge conflicts of 2ff6320d773c to oc-dr1-dev by Rubin Xu · 7 years ago
  91. 2ff6320 Merge "Swap the order of synthetic password wrapping" into oc-dev by TreeHugger Robot · 7 years ago
  92. 87b5b0a Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev by Kevin Hufnagle · 7 years ago
  93. a96e5338 Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev by Kevin Hufnagle · 7 years ago
  94. 3ba37e1 Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev by Jon Dormody · 7 years ago
  95. 728ca23 Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev by Jon Dormody · 7 years ago
  96. ce7f1e6 Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev by Jon Dormody · 7 years ago
  97. fb839ce Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev by Jon Dormody · 7 years ago
  98. 1c7c4b2 Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor by Jonathan Dormody · 7 years ago
  99. 1bca5db Docs: Added mention that the getSharedPreferences method is thread safe. by Jonathan Dormody · 7 years ago
  100. 719e8b5 Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev by Jon Dormody · 7 years ago