Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 27b484acd4ba0ccd459e47901b06e832874967aa
commit27b484acd4ba0ccd459e47901b06e832874967aa[log] [tgz]
authorStephen Hines <srhines@google.com>Tue Sep 02 10:11:14 2014 -0700
committerStephen Hines <srhines@google.com>Tue Sep 02 10:11:14 2014 -0700
tree3a871addf8f056ee09c277ee82e9053784aeadd0
parent9b878b2bc3c1302978c79458b0bb3d504aa191ba [diff]
parentf89af2285961ea882d22174088d557932ef285f8 [diff]
resolved conflicts for merge of f89af228 to lmp-dev-plus-aosp

Change-Id: I8c95fc6a409928262e23640a9aa8fa8bd87ee48c
tree: 3a871addf8f056ee09c277ee82e9053784aeadd0
  1. api/
  2. cpp/
  3. cpu_ref/
  4. driver/
  5. java/
  6. scriptc/
  7. server/
  8. tests/
  9. Android.mk
  10. CleanSpec.mk
  11. rs.h
  12. rs.spec
  13. rs_hal.h
  14. rs_native.spec
  15. rsAdapter.cpp
  16. rsAdapter.h
  17. rsAllocation.cpp
  18. rsAllocation.h
  19. rsAnimation.cpp
  20. rsAnimation.h
  21. rsCompatibilityLib.cpp
  22. rsCompatibilityLib.h
  23. rsComponent.cpp
  24. rsComponent.h
  25. rsContext.cpp
  26. rsContext.h
  27. rsCppUtils.cpp
  28. rsCppUtils.h
  29. rsDebugHelper.h
  30. rsDefines.h
  31. rsDevice.cpp
  32. rsDevice.h
  33. rsElement.cpp
  34. rsElement.h
  35. rsEnv.h
  36. rsFBOCache.cpp
  37. rsFBOCache.h
  38. rsFifo.h
  39. rsFifoSocket.cpp
  40. rsFifoSocket.h
  41. rsFileA3D.cpp
  42. rsFileA3D.h
  43. rsFont.cpp
  44. rsFont.h
  45. rsg.spec
  46. rsg_generator.c
  47. rsgApi.cpp.rsg
  48. rsgApiFuncDecl.h.rsg
  49. rsgApiReplay.cpp.rsg
  50. rsgApiStructs.h.rsg
  51. rsGrallocConsumer.cpp
  52. rsGrallocConsumer.h
  53. rsMatrix2x2.cpp
  54. rsMatrix2x2.h
  55. rsMatrix3x3.cpp
  56. rsMatrix3x3.h
  57. rsMatrix4x4.cpp
  58. rsMatrix4x4.h
  59. rsMesh.cpp
  60. rsMesh.h
  61. rsMutex.cpp
  62. rsMutex.h
  63. rsObjectBase.cpp
  64. rsObjectBase.h
  65. rsPath.cpp
  66. rsPath.h
  67. rsProgram.cpp
  68. rsProgram.h
  69. rsProgramBase.h
  70. rsProgramFragment.cpp
  71. rsProgramFragment.h
  72. rsProgramRaster.cpp
  73. rsProgramRaster.h
  74. rsProgramStore.cpp
  75. rsProgramStore.h
  76. rsProgramVertex.cpp
  77. rsProgramVertex.h
  78. rsRuntime.h
  79. rsSampler.cpp
  80. rsSampler.h
  81. rsScript.cpp
  82. rsScript.h
  83. rsScriptC.cpp
  84. rsScriptC.h
  85. rsScriptC_Lib.cpp
  86. rsScriptC_LibGL.cpp
  87. rsScriptGroup.cpp
  88. rsScriptGroup.h
  89. rsScriptIntrinsic.cpp
  90. rsScriptIntrinsic.h
  91. rsSignal.cpp
  92. rsSignal.h
  93. rsStream.cpp
  94. rsStream.h
  95. rsThreadIO.cpp
  96. rsThreadIO.h
  97. rsType.cpp
  98. rsType.h
  99. rsUtils.h
  100. spec.h
  101. spec.l
  102. update_rs_prebuilts.sh