Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 67d1dd8439b0b9557b1bcfca1588edc52af66107
  1. 67d1dd8 MediaPlayer2: clean up setDataSource by Wei Jia · 6 years ago
  2. 69a144a Merge "Transforms uid to packages for the raw data" by TreeHugger Robot · 6 years ago
  3. 47d79db resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master am: 3147288c3b by Neil Fuller · 6 years ago
  4. f53c7a2 resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master by Neil Fuller · 6 years ago
  5. 31b10bd Merge "MediaPlayer2: merge EventHandler with TaskHandler" by TreeHugger Robot · 6 years ago
  6. 3147288 resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master by Neil Fuller · 6 years ago
  7. d202011 Transforms uid to packages for the raw data by Olivier Gaillard · 6 years ago
  8. 7980b19 Merge "Track changes in libcore to remove a constructor" by Treehugger Robot · 6 years ago
  9. 8826be8 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 am: 6dc57344d6 by Bill Yi · 6 years ago
  10. 11911ed [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours am: 648f0b4c44 -s ours by Bill Yi · 6 years ago
  11. d4c9bbf Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82 am: b5334fff17 by Bill Yi · 6 years ago
  12. 1ee3303 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours am: 0ae92cd7fa -s ours by Bill Yi · 6 years ago
  13. 4fc0ab5 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 by Bill Yi · 6 years ago
  14. 1beddd1 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours by Bill Yi · 6 years ago
  15. 7ed0564 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 am: d91868aee5 by Bill Yi · 6 years ago
  16. 6275ee5 Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82 by Bill Yi · 6 years ago
  17. 611fb78 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours by Bill Yi · 6 years ago
  18. 4e6e574 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours am: 8dfe2e787c -s ours by Bill Yi · 6 years ago
  19. 539952c Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 by Bill Yi · 6 years ago
  20. 37fbc30 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 am: cd74671aa7 by Bill Yi · 6 years ago
  21. dff3f6a [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours by Bill Yi · 6 years ago
  22. e122218 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours am: 84729fca53 -s ours by Bill Yi · 6 years ago
  23. 5b29095 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 by Bill Yi · 6 years ago
  24. 2d117c2 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 am: 12835665f3 by Bill Yi · 6 years ago
  25. 87829f5 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours by Bill Yi · 6 years ago
  26. c98323a [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours am: d18e450922 -s ours am: 8944491476 -s ours by Bill Yi · 6 years ago
  27. 6dc5734 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 by Bill Yi · 6 years ago
  28. 648f0b4 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours by Bill Yi · 6 years ago
  29. b5334ff Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 by Bill Yi · 6 years ago
  30. 0ae92cd [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours by Bill Yi · 6 years ago
  31. d91868a Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 by Bill Yi · 6 years ago
  32. 8dfe2e7 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours by Bill Yi · 6 years ago
  33. cd74671 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 by Bill Yi · 6 years ago
  34. 199b3ee Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea by Bill Yi · 6 years ago
  35. 84729fc [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours by Bill Yi · 6 years ago
  36. c1a9ad2 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours by Bill Yi · 6 years ago
  37. f9a749e Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 by Bill Yi · 6 years ago
  38. 3fab85b Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 by Bill Yi · 6 years ago
  39. 1080ba6 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours by Bill Yi · 6 years ago
  40. e2a7c24 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 by Bill Yi · 6 years ago
  41. 9969f29b [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours am: d18e450922 -s ours by Bill Yi · 6 years ago
  42. 9bf5cb9 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours by Bill Yi · 6 years ago
  43. 1283566 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 by Bill Yi · 6 years ago
  44. 086abb7 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 by Bill Yi · 6 years ago
  45. 8944491 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours by Bill Yi · 6 years ago
  46. d635022 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours by Bill Yi · 6 years ago
  47. c3ff91a Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 by Bill Yi · 6 years ago
  48. 439f8bc Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b am: 402176177c by Bill Yi · 6 years ago
  49. d18e450 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours by Bill Yi · 6 years ago
  50. 48441ff [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours am: d9d9d1daca -s ours am: 9f950537e4 -s ours by Bill Yi · 6 years ago
  51. b263a1a Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b by Bill Yi · 6 years ago
  52. 7557661 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev by Bill Yi · 6 years ago
  53. bf6bbef [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 by Bill Yi · 6 years ago
  54. 64b9fb5 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours am: d9d9d1daca -s ours by Bill Yi · 6 years ago
  55. af687ad Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev by Bill Yi · 6 years ago
  56. a8276b8 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 by Bill Yi · 6 years ago
  57. a23f9ab [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours am: 03e1c5f227 -s ours am: 05968703a2 -s ours by Bill Yi · 6 years ago
  58. 851e826 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev by Bill Yi · 6 years ago
  59. 4021761 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 by Bill Yi · 6 years ago
  60. f2ea6f5 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 by Bill Yi · 6 years ago
  61. b434b0c Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev by Bill Yi · 6 years ago
  62. 67f18d8 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 by Bill Yi · 6 years ago
  63. 9f95053 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours by Bill Yi · 6 years ago
  64. 812ec62 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev by Bill Yi · 6 years ago
  65. fcca5bb7 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 by Bill Yi · 6 years ago
  66. 4a4b554 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours am: 03e1c5f227 -s ours by Bill Yi · 6 years ago
  67. 5d61a66 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f by Bill Yi · 6 years ago
  68. d9d9d1d [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours by Bill Yi · 6 years ago
  69. 0596870 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours by Bill Yi · 6 years ago
  70. f051b28 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev by Bill Yi · 6 years ago
  71. 03e1c5f [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours by Bill Yi · 6 years ago
  72. e45b804 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc by Bill Yi · 6 years ago
  73. 4065ce8 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab by Bill Yi · 6 years ago
  74. cec9310 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev by TreeHugger Robot · 6 years ago
  75. 72e16b1 Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev by TreeHugger Robot · 6 years ago
  76. 6005492 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev by TreeHugger Robot · 6 years ago
  77. 37d9749 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev by TreeHugger Robot · 6 years ago
  78. c1dc805 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev by TreeHugger Robot · 6 years ago
  79. ec4d649 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev by TreeHugger Robot · 6 years ago
  80. 2e368c3 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 6 years ago
  81. 4b8d56f Merge "Fix GraphicBuffer creation not to use 0 usage flag" by TreeHugger Robot · 6 years ago
  82. a056273 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 by Android Build Merger (Role) · 6 years ago
  83. 39c48a1 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae by Android Build Merger (Role) · 6 years ago
  84. e35f1fd Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  85. 9204ce4 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc by Android Build Merger (Role) · 6 years ago
  86. f028c34 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 by Android Build Merger (Role) · 6 years ago
  87. cd4aea6 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  88. 998f40e [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 by Android Build Merger (Role) · 6 years ago
  89. 8062f29 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec by Android Build Merger (Role) · 6 years ago
  90. 32c0874 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  91. eacf5ff [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 by Android Build Merger (Role) · 6 years ago
  92. ace44c1 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d by Android Build Merger (Role) · 6 years ago
  93. f02d296 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  94. 8700285 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 by Android Build Merger (Role) · 6 years ago
  95. 4740838 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 by Android Build Merger (Role) · 6 years ago
  96. ff2f705 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  97. b3bf111 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab by Android Build Merger (Role) · 6 years ago
  98. b586d4e [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 by Android Build Merger (Role) · 6 years ago
  99. f8ecf21 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  100. c6d9bee [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 by Android Build Merger (Role) · 6 years ago