Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 0eb43458e454c9ad0fc74166d5f686cddf8d69b6
  1. 0eb4345 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  2. 90d666c Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp by Michael Wright · 7 years ago
  3. 75caeb2 Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e am: 4c535d5580 by Adrian Roos · 7 years ago
  4. 17e4ef5 Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42b3 am: d9cc31d158 by Michael Wright · 7 years ago
  5. 8634c71 Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e am: 67c19ff3a6 by Adrian Roos · 7 years ago
  6. 2451986 Merge "resolve merge conflicts of 180f4ee7f78e to master" by TreeHugger Robot · 7 years ago
  7. 5d3ff60 Merge "Remove a couple of unused android.webkit methods." by TreeHugger Robot · 7 years ago
  8. 9bbf911 Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  9. ec0e69c Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42b3 by Michael Wright · 7 years ago
  10. 9ecfd2c Merge "Unhide DelegateLastClassLoader." by Narayan Kamath · 7 years ago
  11. 5c22515 Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42b3 by Michael Wright · 7 years ago
  12. 8a77c6e Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e by Adrian Roos · 7 years ago
  13. d1f6ab4 Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e by Adrian Roos · 7 years ago
  14. d9cc31d Merge "Add config to force display to transition to off after doze" into oc-dr1-dev by Michael Wright · 7 years ago
  15. f0613cd Merge "Add config to force display to transition to off after doze" into oc-dr1-dev by Michael Wright · 7 years ago
  16. 67c19ff Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e by Adrian Roos · 7 years ago
  17. 4c535d5 Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e by Adrian Roos · 7 years ago
  18. cb423e4 Merge "Add config to force display to transition to off after doze" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  19. 5f62026 Merge "Flicker free screen-on from AOD" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  20. 3fe668a resolve merge conflicts of 180f4ee7f78e to master by Geoffrey Pitsch · 7 years ago
  21. 180f4ee Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev by Geoffrey Pitsch · 7 years ago
  22. 2d33563 Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  23. 75e7ee9 Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: e7e68b8991 by Suprabh Shukla · 7 years ago
  24. 301f23d Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: ab0e78c4b4 by Suprabh Shukla · 7 years ago
  25. 5f86e9f Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: e7e68b8991 by Suprabh Shukla · 7 years ago
  26. 023dbcd Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: ab0e78c4b4 by Suprabh Shukla · 7 years ago
  27. ab0e78c Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d by Suprabh Shukla · 7 years ago
  28. e7e68b8 Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d by Suprabh Shukla · 7 years ago
  29. 928aad3 Merge "Fixing TaskPersisterTest" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  30. e4cb6c8a Flicker free screen-on from AOD by Adrian Roos · 7 years ago
  31. e3ccfd7 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586 am: 34ad34d199 by Hugo Benichi · 7 years ago
  32. eff89fc Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586 by Hugo Benichi · 7 years ago
  33. 34ad34d Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 by Hugo Benichi · 7 years ago
  34. 8b8a0ef Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 by Hugo Benichi · 7 years ago
  35. 3d423c9 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 by Hugo Benichi · 7 years ago
  36. 89e4c1c Merge "Refactor TextUtils.join() and add documentation" by TreeHugger Robot · 7 years ago
  37. e0a743d0 Merge "IpManagerTest: fix flaky test for real" by Treehugger Robot · 7 years ago
  38. 2b65b129 Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev am: 5f927337c0" into oc-mr1-dev-plus-aosp by Amith Yamasani · 7 years ago
  39. 52f61a2 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp by Amith Yamasani · 7 years ago
  40. 6a60930 Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev am: dde0e6ad21 by Etan Cohen · 7 years ago
  41. 55e5078 Merge "Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47" into oc-mr1-dev-plus-aosp by Love Khanna · 7 years ago
  42. e8977e9 Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev am: 5f927337c0" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  43. d1496ec Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  44. 952d173 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev by Amith Yamasani · 7 years ago
  45. 6b2fb28 Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe by Amith Yamasani · 7 years ago
  46. fae8a90 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a by Love Khanna · 7 years ago
  47. ee58159 Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev by Etan Cohen · 7 years ago
  48. 04f7602 Merge "Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  49. 5f92733 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev by Android Build Merger (Role) · 7 years ago
  50. 30f2df2 Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by Amith Yamasani · 7 years ago
  51. d206755 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a by Love Khanna · 7 years ago
  52. fc923bb Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by Amith Yamasani · 7 years ago
  53. 58d44ad Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47 by Love Khanna · 7 years ago
  54. e9bdc19 IpManagerTest: fix flaky test for real by Hugo Benichi · 7 years ago
  55. dde0e6a Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  56. 1d3929d Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 by Love Khanna · 7 years ago
  57. 1e43a74 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 by Love Khanna · 7 years ago
  58. 6b4f0bb Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  59. f8469cc Merge "NFC DTA Integration" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  60. 19d8565 Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: ed005b2928" into oc-mr1-dev-plus-aosp by Glen Kuhne · 7 years ago
  61. a8b74c8 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: 640f04ef38 by Glen Kuhne · 7 years ago
  62. 7df3410 Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: ed005b2928" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  63. e96e42b Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 by Glen Kuhne · 7 years ago
  64. d6d285e Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 by Glen Kuhne · 7 years ago
  65. 640f04e Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by Glen Kuhne · 7 years ago
  66. ed005b2 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by Glen Kuhne · 7 years ago
  67. 860f185 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  68. 7edc610 Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 06a6d6bbed" into oc-mr1-dev-plus-aosp by Sundeep Ghuman · 7 years ago
  69. 37d8ea3 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 34df6c0af3 by Sundeep Ghuman · 7 years ago
  70. e2f98d2 Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 06a6d6bbed" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  71. e4e3419 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 7 years ago
  72. e2af703 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 7 years ago
  73. 06a6d6b Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 7 years ago
  74. 34df6c0 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 7 years ago
  75. c71c832 Merge "Use the Context's locale in DateFormat" by TreeHugger Robot · 7 years ago
  76. 3b63aa7 Merge "Do not clear scores during stopTracking." into oc-dr1-dev by TreeHugger Robot · 7 years ago
  77. 51bd66d Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 82bc67193d" into oc-mr1-dev-plus-aosp by Winson Chung · 7 years ago
  78. 1b22a6a Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 65d5b0b93d by Winson Chung · 7 years ago
  79. 42673c3 Refactor TextUtils.join() and add documentation by Roozbeh Pournader · 7 years ago
  80. 7abb962 Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 82bc67193d" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  81. 21bc18f Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f by Winson Chung · 7 years ago
  82. 3270c21 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f by Winson Chung · 7 years ago
  83. 65d5b0b Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 7 years ago
  84. 82bc671 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 7 years ago
  85. a363ab9 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 7 years ago
  86. 7d97b91 Merge "Support font resource in TextAppearanceSpan" by TreeHugger Robot · 7 years ago
  87. eba529b Merge "Data plan setting in SystemUI quick settings." by Rajeev Kumar · 7 years ago
  88. 755a8fa NFC DTA Integration by Love Khanna · 7 years ago
  89. eff6ae0 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 am: f4292bacf9 by Amit Mahajan · 7 years ago
  90. e02ce08 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 am: d57fcca823 by Amit Mahajan · 7 years ago
  91. 3a6bfc6 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 by Amit Mahajan · 7 years ago
  92. df69227 Merge "Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 8b1a5af473" into oc-mr1-dev-plus-aosp am: 6f62fe1adc" by Android Build Merger (Role) · 7 years ago
  93. 3f8c9e4 Merge "Media API: fix possible NPE" by TreeHugger Robot · 7 years ago
  94. 743f4f8 Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 8b1a5af473" into oc-mr1-dev-plus-aosp by Selim Cinek · 7 years ago
  95. 7b2fac8 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 by Amit Mahajan · 7 years ago
  96. 291672c Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 0d7ff5328e by Selim Cinek · 7 years ago
  97. db8167e Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 am: f86be8d22d by Mady Mellor · 7 years ago
  98. 3e4bf84 Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 am: dbb5c98423 by Mady Mellor · 7 years ago
  99. d57fcca Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev by Amit Mahajan · 7 years ago
  100. f4292ba Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev by Amit Mahajan · 7 years ago