Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / aa60c74f5d11621c0435b349c81da25a5fded3da
  1. aa60c74 resolve merge conflicts of 64e19de569ac to master by Jason Monk · 7 years ago
  2. 037444d Merge "Change score cache eviction time to settings value." by TreeHugger Robot · 7 years ago
  3. 27f9b24 Merge "Remove dependency on platform-system-robolectric" by TreeHugger Robot · 7 years ago
  4. 4863413 Merge "Start paving the way for vold calls over Binder." by Jeff Sharkey · 7 years ago
  5. 9bb85d3 Change score cache eviction time to settings value. by Sundeep Ghuman · 7 years ago
  6. 91761cb Merge "Add ACTIVITY_TYPE and STACK_ID constants to Test API" by TreeHugger Robot · 7 years ago
  7. 5f3af50 Merge "Convert Activity and WindowManager Tests to Device Side" by TreeHugger Robot · 7 years ago
  8. e597ca1 Add ACTIVITY_TYPE and STACK_ID constants to Test API by Steven Timotius · 7 years ago
  9. a0991b7 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  10. 32b4fe2 Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev am: 66204a42cb by Dan Sandler · 7 years ago
  11. 1cdb685 Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 018d1e066e -s ours" into oc-mr1-dev-plus-aosp by Bill Yi · 7 years ago
  12. 92c2fc4 Merge "Merge "idmap: include idmap version in check for stale file" am: 609887a980 am: a15992086c am: d7f3a7b095" into oc-mr1-dev-plus-aosp by Adam Lesinski · 7 years ago
  13. d18a1cc Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev am: 5d340bce89 by Daniel Nishi · 7 years ago
  14. 3f627f9 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  15. b9f619d Merge "Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev am: 2556236f8e am: 9c869043e9" by Android Build Merger (Role) · 7 years ago
  16. 82a1a4a Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev am: 2556236f8e by Dianne Hackborn · 7 years ago
  17. 9a24a10 Merge "Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be am: aed3472304 am: 22720ffb5f" by Android Build Merger (Role) · 7 years ago
  18. 64e19de Merge "Add metrics for status bar" into oc-mr1-dev am: 69f3e18e0c by Jason Monk · 7 years ago
  19. 6485a45 Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be am: aed3472304 by Mårten Kongstad · 7 years ago
  20. 71d8293 Merge "Merge "Use raw string when setting wifi preference title." into oc-mr1-dev am: 8c3ce8d60b am: 523eb32dd0 -s ours" by Android Build Merger (Role) · 7 years ago
  21. 458d6a8 Remove dependency on platform-system-robolectric by Maurice Lam · 7 years ago
  22. 966796a Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev am: 66204a42cb by Dan Sandler · 7 years ago
  23. 1476eef Merge "Use raw string when setting wifi preference title." into oc-mr1-dev am: 8c3ce8d60b by Fan Zhang · 7 years ago
  24. e9dda72 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours am: 5e1838a14e -s ours am: 47d1780be0 -s ours" by Android Build Merger (Role) · 7 years ago
  25. 69f3e18 Merge "Add metrics for status bar" into oc-mr1-dev by Jason Monk · 7 years ago
  26. a132b5e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours am: 5e1838a14e -s ours by Bill Yi · 7 years ago
  27. dd3a9a7 Merge "Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours" into oc-mr1-dev am: 8506d1085e -s ours am: 5d44e5c045 -s ours" by Android Build Merger (Role) · 7 years ago
  28. 6aa5e9f Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  29. 67f4438 Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours" into oc-mr1-dev am: 8506d1085e -s ours by Bill Yi · 7 years ago
  30. b641261 Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 018d1e066e -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  31. 66204a4 Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev by TreeHugger Robot · 7 years ago
  32. 6ec188e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev by Bill Yi · 7 years ago
  33. 9964aa9 Merge "Merge "idmap: include idmap version in check for stale file" am: 609887a980 am: a15992086c am: d7f3a7b095" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  34. 83150b5 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours am: 58ba7d4cde -s ours" into oc-mr1-dev-plus-aosp by Bill Yi · 7 years ago
  35. d0a60f9 Merge "idmap: include idmap version in check for stale file" am: 609887a980 am: a15992086c by Adam Lesinski · 7 years ago
  36. 942db56 Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev by Daniel Nishi · 7 years ago
  37. d7f3a7b Merge "idmap: include idmap version in check for stale file" am: 609887a980 by Adam Lesinski · 7 years ago
  38. 9c86904 Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev by Dianne Hackborn · 7 years ago
  39. 9384071 Merge "Import translations. DO NOT MERGE" by Bill Yi · 7 years ago
  40. 22720ff Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be by Mårten Kongstad · 7 years ago
  41. a159920 Merge "idmap: include idmap version in check for stale file" am: 609887a980 by Adam Lesinski · 7 years ago
  42. aed3472 Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be by Mårten Kongstad · 7 years ago
  43. 523eb32 Merge "Use raw string when setting wifi preference title." into oc-mr1-dev by Fan Zhang · 7 years ago
  44. 47d1780 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours by Bill Yi · 7 years ago
  45. 4f4218a Merge "idmap: suppress print for padded resources" am: 3949701c6f by Mårten Kongstad · 7 years ago
  46. 018d1e0 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  47. 5d340bc Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev by Daniel Nishi · 7 years ago
  48. e2ad463 Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14b975a42d -s ours" into oc-mr1-dev-plus-aosp by Bill Yi · 7 years ago
  49. 5d44e5c Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours" into oc-mr1-dev by Bill Yi · 7 years ago
  50. 2556236 Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev by TreeHugger Robot · 7 years ago
  51. d3810d8 Merge "Introducing ConfigurationContainerListener" by Wale Ogunwale · 7 years ago
  52. 24ddd78 Merge "Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev am: 3b0d11c887" into oc-mr1-dev-plus-aosp by Amith Yamasani · 7 years ago
  53. 1019de9 Start paving the way for vold calls over Binder. by Jeff Sharkey · 7 years ago
  54. b347e1f Merge "Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp am: edc9bbc042 -s ours am: 72445ec608 -s ours" by Android Build Merger (Role) · 7 years ago
  55. 609887a Merge "idmap: include idmap version in check for stale file" by Adam Lesinski · 7 years ago
  56. f8ab472 Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp am: edc9bbc042 -s ours by Colin Cross · 7 years ago
  57. 3949701 Merge "idmap: suppress print for padded resources" by Treehugger Robot · 7 years ago
  58. b8c76f8 Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours am: be2efcef20 -s ours am: af00336df8 -s ours" by Android Build Merger (Role) · 7 years ago
  59. c8c4e58 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours am: 58ba7d4cde -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  60. 865c474 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  61. 3aedd96 Import translations. DO NOT MERGE am: 2c1d066618 -s ours am: be2efcef20 -s ours by Bill Yi · 7 years ago
  62. 4c652d2 Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14b975a42d -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  63. d44439b Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours by Bill Yi · 7 years ago
  64. cde7b84 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev by Bill Yi · 7 years ago
  65. 9a7b35f Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  66. 8c3ce8d Merge "Use raw string when setting wifi preference title." into oc-mr1-dev by TreeHugger Robot · 7 years ago
  67. e455b42 Merge "Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev am: 3b0d11c887" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  68. fa4d94f Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev by Amith Yamasani · 7 years ago
  69. 72445ec Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp by Colin Cross · 7 years ago
  70. 51e3fd6 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  71. af00336 Import translations. DO NOT MERGE am: 2c1d066618 -s ours by Bill Yi · 7 years ago
  72. 456d7e90 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  73. 58ba7d4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by Bill Yi · 7 years ago
  74. 5e1838a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by Bill Yi · 7 years ago
  75. edc9bbc Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  76. 4b87e38 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  77. 8506d10 Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 7 years ago
  78. 3ca8034 Merge "Merge "Close idle connections to release RAM" into oc-mr1-dev am: da49d05a8d am: 5ee20f2b92" by Android Build Merger (Role) · 7 years ago
  79. 2011a3a Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 by Colin Cross · 7 years ago
  80. d39f84d Merge "AAPT2: Debug::DumpXml display compiled attribute values." by TreeHugger Robot · 7 years ago
  81. 14b975a Merge "Import translations. DO NOT MERGE" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  82. 83feffe Import translations. DO NOT MERGE am: 2c1d066618 -s ours by Bill Yi · 7 years ago
  83. f8c2f7b Add metrics for status bar by Jason Monk · 7 years ago
  84. be2efce Import translations. DO NOT MERGE am: 2c1d066618 -s ours by Bill Yi · 7 years ago
  85. e13c1c1 Merge "Close idle connections to release RAM" into oc-mr1-dev am: da49d05a8d by Fyodor Kupolov · 7 years ago
  86. b1d8caa Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  87. 3b0d11c Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev by Amith Yamasani · 7 years ago
  88. 6eb107a Merge "Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev am: 102f564165 am: 47be923fd5" by Android Build Merger (Role) · 7 years ago
  89. 24a878f Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  90. 5ee20f2b Merge "Close idle connections to release RAM" into oc-mr1-dev am: da49d05a8d by Fyodor Kupolov · 7 years ago
  91. 044ddc2 Merge "Fix intermittent build failures with droiddoc generated sources" by Colin Cross · 7 years ago
  92. 15d5844 Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev am: 102f564165 by Chad Brubaker · 7 years ago
  93. da49d05 Merge "Close idle connections to release RAM" into oc-mr1-dev by Fyodor Kupolov · 7 years ago
  94. e870da3 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  95. a11709b Merge "Fix intermittent build failures with droiddoc generated sources" by Colin Cross · 7 years ago
  96. 862e104 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  97. 47be923 Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev by Chad Brubaker · 7 years ago
  98. bba5792 Merge "Remove redundant vmpolicy variable" by Kurt Nelson · 7 years ago
  99. 102f564 Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev by Chad Brubaker · 7 years ago
  100. 5e9219d Merge "Fix shift in share sheet" into oc-mr1-dev am: 3a31bdede5 am: 8ca3a3661b by Jason Monk · 7 years ago