Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / rs / 140a7acade66ab5d1f3dc55803a3a65a71f3f86c
commit140a7acade66ab5d1f3dc55803a3a65a71f3f86c[log] [tgz]
authorStephen Hines <srhines@google.com>Thu Jul 11 11:45:00 2013 -0700
committerStephen Hines <srhines@google.com>Thu Jul 11 11:45:00 2013 -0700
treeb509442693511faf019bb0479669f8422362541f
parent3ad07bf0ccb9064695013d8c61bacaec26a97e6b [diff]
parent5376c9bfa7f4434dde29a31a7437f25708b1b009 [diff]
resolved conflicts for merge of 5376c9bf to master

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