Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / rs / b16f26ec37e5225ed253c83dbff4fcd037041fc8
  1. b16f26e Merge "Add LOCAL_LICENSE_KINDS to frameworks/rs" am: f1634aa2d9 am: 4a268fbf34 am: cdbb129343 by Treehugger Robot · 3 years, 6 months ago int/13/fp4
  2. cdbb129 Merge "Add LOCAL_LICENSE_KINDS to frameworks/rs" am: f1634aa2d9 am: 4a268fbf34 by Treehugger Robot · 3 years, 6 months ago
  3. 4a268fb Merge "Add LOCAL_LICENSE_KINDS to frameworks/rs" am: f1634aa2d9 by Treehugger Robot · 3 years, 6 months ago
  4. f1634aa Merge "Add LOCAL_LICENSE_KINDS to frameworks/rs" by Treehugger Robot · 3 years, 6 months ago
  5. 609ef9c Add LOCAL_LICENSE_KINDS to frameworks/rs by Bob Badour · 3 years, 6 months ago
  6. 2d81804 Merge "Convert ImageProcessing2/Android.mk to Android.bp" am: 19ac7e1a23 am: 47460c3484 am: f33d4971cd by Yuntao Xu · 3 years, 6 months ago
  7. d6ba5c3 Merge "Convert RSTest*/Android.mk to Android.bp" am: 70f01e220b am: 3ac7a06462 am: 3c39320969 by Yuntao Xu · 3 years, 6 months ago
  8. f33d497 Merge "Convert ImageProcessing2/Android.mk to Android.bp" am: 19ac7e1a23 am: 47460c3484 by Yuntao Xu · 3 years, 6 months ago
  9. 3c39320 Merge "Convert RSTest*/Android.mk to Android.bp" am: 70f01e220b am: 3ac7a06462 by Yuntao Xu · 3 years, 6 months ago
  10. 47460c3 Merge "Convert ImageProcessing2/Android.mk to Android.bp" am: 19ac7e1a23 by Yuntao Xu · 3 years, 6 months ago
  11. 3ac7a06 Merge "Convert RSTest*/Android.mk to Android.bp" am: 70f01e220b by Yuntao Xu · 3 years, 6 months ago
  12. 19ac7e1 Merge "Convert ImageProcessing2/Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  13. 70f01e2 Merge "Convert RSTest*/Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  14. b930964 Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 am: f0515e4a16 am: 601409fa44 by Yuntao Xu · 3 years, 6 months ago
  15. 601409f Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 am: f0515e4a16 by Yuntao Xu · 3 years, 6 months ago
  16. f0515e4 Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 by Yuntao Xu · 3 years, 6 months ago
  17. 0acf6dd Merge "Convert HealingBrush/Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  18. 82499ee [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: c943bd1099 -s ours am: 923ffd6a85 -s ours by Xin Li · 3 years, 6 months ago
  19. 923ffd6 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: c943bd1099 -s ours by Xin Li · 3 years, 6 months ago
  20. c943bd1 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 by Xin Li · 3 years, 6 months ago
  21. cc0f1db Merge "Convert Balls/Android.mk to Android.bp" am: 8883e09212 am: 878f1a546a am: 5ccd566091 am: a7dbfcd21b by Yuntao Xu · 3 years, 6 months ago
  22. a7dbfcd Merge "Convert Balls/Android.mk to Android.bp" am: 8883e09212 am: 878f1a546a am: 5ccd566091 by Yuntao Xu · 3 years, 6 months ago
  23. 5ccd566 Merge "Convert Balls/Android.mk to Android.bp" am: 8883e09212 am: 878f1a546a by Yuntao Xu · 3 years, 6 months ago
  24. 878f1a5 Merge "Convert Balls/Android.mk to Android.bp" am: 8883e09212 by Yuntao Xu · 3 years, 6 months ago
  25. 8883e09 Merge "Convert Balls/Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  26. 6b8f1fd Convert Balls/Android.mk to Android.bp by Yuntao Xu · 3 years, 10 months ago
  27. 5ec8bd7 Merge "Convert Refocus/Android.mk to Android.bp" am: d602402e0b am: 321c4bf5e9 am: dc549b4c5d am: df131370f6 by Yuntao Xu · 3 years, 6 months ago
  28. df13137 Merge "Convert Refocus/Android.mk to Android.bp" am: d602402e0b am: 321c4bf5e9 am: dc549b4c5d by Yuntao Xu · 3 years, 6 months ago
  29. dc549b4 Merge "Convert Refocus/Android.mk to Android.bp" am: d602402e0b am: 321c4bf5e9 by Yuntao Xu · 3 years, 6 months ago
  30. 321c4bf Merge "Convert Refocus/Android.mk to Android.bp" am: d602402e0b by Yuntao Xu · 3 years, 6 months ago
  31. d602402 Merge "Convert Refocus/Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  32. a36176e Convert ImageProcessing2/Android.mk to Android.bp by Yuntao Xu · 3 years, 6 months ago
  33. 224bfe5 Convert Refocus/Android.mk to Android.bp by Yuntao Xu · 3 years, 6 months ago
  34. d885125 Convert HealingBrush/Android.mk to Android.bp by Yuntao Xu · 3 years, 6 months ago
  35. 0696281 Merge "Convert Android.mk to Android.bp" am: ccb154081b am: 7a4aab8079 am: 3d0cf06136 am: d83f261967 by Yuntao Xu · 3 years, 6 months ago
  36. d83f261 Merge "Convert Android.mk to Android.bp" am: ccb154081b am: 7a4aab8079 am: 3d0cf06136 by Yuntao Xu · 3 years, 6 months ago
  37. 3d0cf06 Merge "Convert Android.mk to Android.bp" am: ccb154081b am: 7a4aab8079 by Yuntao Xu · 3 years, 6 months ago
  38. 7a4aab8 Merge "Convert Android.mk to Android.bp" am: ccb154081b by Yuntao Xu · 3 years, 6 months ago
  39. ccb1540 Merge "Convert Android.mk to Android.bp" by Yuntao Xu · 3 years, 6 months ago
  40. 00687a1 Convert RSTest*/Android.mk to Android.bp by Yuntao Xu · 3 years, 6 months ago
  41. c8d3cb5 Merge "Migrate HelloComputeNDK and libhellocomputendk" am: d76b136dee am: cae471d168 am: 00fc0af883 am: 10d6520057 by Trevor Radcliffe · 3 years, 6 months ago
  42. 10d6520 Merge "Migrate HelloComputeNDK and libhellocomputendk" am: d76b136dee am: cae471d168 am: 00fc0af883 by Trevor Radcliffe · 3 years, 6 months ago
  43. 00fc0af Merge "Migrate HelloComputeNDK and libhellocomputendk" am: d76b136dee am: cae471d168 by Trevor Radcliffe · 3 years, 6 months ago
  44. cae471d Merge "Migrate HelloComputeNDK and libhellocomputendk" am: d76b136dee by Trevor Radcliffe · 3 years, 6 months ago
  45. d76b136 Merge "Migrate HelloComputeNDK and libhellocomputendk" by Trevor Radcliffe · 3 years, 6 months ago
  46. 7e097c0 Migrate HelloComputeNDK and libhellocomputendk by Trevor Radcliffe · 3 years, 10 months ago
  47. e5b5d10 Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f am: c3d2fd7f2c am: 2359e66ea7 am: b53b5c56a7 by Yuntao Xu · 3 years, 10 months ago
  48. b53b5c5 Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f am: c3d2fd7f2c am: 2359e66ea7 by Yuntao Xu · 3 years, 10 months ago
  49. 2359e66 Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f am: c3d2fd7f2c by Yuntao Xu · 3 years, 10 months ago
  50. c3d2fd7 Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f by Yuntao Xu · 3 years, 10 months ago
  51. 522e889 Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 by Yuntao Xu · 3 years, 10 months ago
  52. cee1aae Merge "Convert cpp_api/../Android.mk to Android.bp" by Yuntao Xu · 3 years, 10 months ago
  53. 39e2923 Merge "Disable device builds on Mac" am: c3ef9288dc am: af408afd6a am: 97d9ac5f91 am: faa18a9bf8 am: 3f62eb2b3c by Dan Willemsen · 3 years, 10 months ago
  54. 3f62eb2 Merge "Disable device builds on Mac" am: c3ef9288dc am: af408afd6a am: 97d9ac5f91 am: faa18a9bf8 by Dan Willemsen · 3 years, 10 months ago
  55. faa18a9 Merge "Disable device builds on Mac" am: c3ef9288dc am: af408afd6a am: 97d9ac5f91 by Dan Willemsen · 3 years, 10 months ago
  56. 97d9ac5 Merge "Disable device builds on Mac" am: c3ef9288dc am: af408afd6a by Dan Willemsen · 3 years, 10 months ago
  57. af408af Merge "Disable device builds on Mac" am: c3ef9288dc by Dan Willemsen · 3 years, 10 months ago
  58. c3ef928 Merge "Disable device builds on Mac" by Dan Willemsen · 3 years, 10 months ago
  59. fb0e5e5 Disable device builds on Mac by Dan Willemsen · 3 years, 10 months ago
  60. 8a301ba Convert cpp_api/../Android.mk to Android.bp by Yuntao Xu · 3 years, 10 months ago
  61. fc31078 Convert Android.mk to Android.bp by Yuntao Xu · 4 years, 2 months ago
  62. f130fff [automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours am: 44620257a0 -s ours am: 154fbde93a -s ours am: f2b5d057d7 -s ours by Xin Li · 3 years, 10 months ago
  63. f2b5d05 [automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours am: 44620257a0 -s ours am: 154fbde93a -s ours by Xin Li · 3 years, 10 months ago
  64. 154fbde [automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours am: 44620257a0 -s ours by Xin Li · 3 years, 10 months ago
  65. 4462025 [automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours am: e6ba0053fe -s ours by Xin Li · 3 years, 10 months ago
  66. e6ba005 [automerger skipped] Merge "Merge Android 12" am: 1a18922293 -s ours by Xin Li · 3 years, 10 months ago
  67. 1a18922 Merge "Merge Android 12" by Xin Li · 3 years, 10 months ago
  68. 271c0cb Merge Android 12 by Xin Li · 3 years, 10 months ago
  69. ee36b8f [automerger skipped] Add android:exported tag am: 15787136e8 -s ours am: d80169d26d -s ours am: 083097e7fc -s ours am: bbc10b88b1 -s ours by Colin Cross · 4 years ago
  70. bbc10b8 [automerger skipped] Add android:exported tag am: 15787136e8 -s ours am: d80169d26d -s ours am: 083097e7fc -s ours by Colin Cross · 4 years ago
  71. 083097e [automerger skipped] Add android:exported tag am: 15787136e8 -s ours am: d80169d26d -s ours by Colin Cross · 4 years ago
  72. d80169d [automerger skipped] Add android:exported tag am: 15787136e8 -s ours by Colin Cross · 4 years ago
  73. 1578713 Add android:exported tag by Colin Cross · 4 years ago
  74. 5375aae Merge "Remove Python test suite for debugging a RenderScript app using lldb." am: e574ce5ce9 am: 93e234010a am: 6c9c450dd8 am: 694d9889d3 am: 2db33cd4e4 by Treehugger Robot · 4 years ago
  75. 2db33cd Merge "Remove Python test suite for debugging a RenderScript app using lldb." am: e574ce5ce9 am: 93e234010a am: 6c9c450dd8 am: 694d9889d3 by Treehugger Robot · 4 years ago
  76. 694d988 Merge "Remove Python test suite for debugging a RenderScript app using lldb." am: e574ce5ce9 am: 93e234010a am: 6c9c450dd8 by Treehugger Robot · 4 years ago
  77. 6c9c450 Merge "Remove Python test suite for debugging a RenderScript app using lldb." am: e574ce5ce9 am: 93e234010a by Treehugger Robot · 4 years ago
  78. 93e2340 Merge "Remove Python test suite for debugging a RenderScript app using lldb." am: e574ce5ce9 by Treehugger Robot · 4 years ago
  79. e574ce5 Merge "Remove Python test suite for debugging a RenderScript app using lldb." by Treehugger Robot · 4 years ago
  80. 87ec204 Remove Python test suite for debugging a RenderScript app using lldb. by David Gross · 4 years ago
  81. b53d277 [automerger skipped] Merge "Add android:exported tag" into sc-dev-plus-aosp am: f2f74e6639 am: e048d6080b am: 13b5b62415 -s ours by Colin Cross · 4 years ago
  82. 13b5b62 Merge "Add android:exported tag" into sc-dev-plus-aosp am: f2f74e6639 am: e048d6080b by Colin Cross · 4 years ago
  83. e048d60 Merge "Add android:exported tag" into sc-dev-plus-aosp am: f2f74e6639 by Colin Cross · 4 years ago
  84. f2f74e6 Merge "Add android:exported tag" into sc-dev-plus-aosp by Colin Cross · 4 years ago
  85. 42af135 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours am: e7947fced0 -s ours am: bff75f0143 -s ours am: 523cedfa51 -s ours by Xin Li · 4 years ago
  86. 523cedf [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours am: e7947fced0 -s ours am: bff75f0143 -s ours by Xin Li · 4 years ago
  87. bff75f0 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours am: e7947fced0 -s ours by Xin Li · 4 years ago
  88. efce8fe Add android:exported tag by Colin Cross · 4 years ago
  89. e7947fc [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours by Xin Li · 4 years ago
  90. 302c1e6 Merge sc-dev-plus-aosp-without-vendor@7634622 by Xin Li · 4 years ago
  91. 761c37a Add android:exported tag by Colin Cross · 4 years ago
  92. 1e327cf Merge "add the rs_script_api module" am: f2e78c2c95 am: eace3e41f4 am: 07fa6feb4d am: 0cbc084aa8 by Yuntao Xu · 4 years, 1 month ago
  93. 0cbc084 Merge "add the rs_script_api module" am: f2e78c2c95 am: eace3e41f4 am: 07fa6feb4d by Yuntao Xu · 4 years, 1 month ago
  94. 07fa6fe Merge "add the rs_script_api module" am: f2e78c2c95 am: eace3e41f4 by Yuntao Xu · 4 years, 1 month ago
  95. eace3e4 Merge "add the rs_script_api module" am: f2e78c2c95 by Yuntao Xu · 4 years, 1 month ago
  96. f2e78c2 Merge "add the rs_script_api module" by Yuntao Xu · 4 years, 1 month ago
  97. f42746a add the rs_script_api module by Yuntao Xu · 4 years, 2 months ago
  98. fbedb5e Merge sc-mainline-prod to master. by Bill Rassieur · 4 years, 3 months ago
  99. b7316b7 Merge "Convert Android.mk to Android.bp" am: 301483980c am: 75436afd61 am: 84ed246fbe am: e50017c8ff am: 2a3df51b4e am: 13a2469386 by Yuntao Xu · 4 years, 3 months ago
  100. 620cc8a Merge "Convert Android.mk to Android.bp" am: 301483980c am: 75436afd61 am: 84ed246fbe am: e50017c8ff am: 0c879773f1 am: 515ce1c9e3 by Yuntao Xu · 4 years, 3 months ago