Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_rs / ef7cb5ce9217c08eef64319a223474a8516dacf7
commitef7cb5ce9217c08eef64319a223474a8516dacf7[log] [tgz]
authorStephen Hines <srhines@google.com>Thu Aug 15 15:50:25 2013 -0700
committerStephen Hines <srhines@google.com>Thu Aug 15 15:50:25 2013 -0700
treeeb0a1d03df2f5ea35fb58bda1850515752634570
parentfd5136767dee529cfcab02bb766b7d369e20ba58 [diff]
parentf0b81d23c15f638e4f96510fecf94e3e1a370b4c [diff]
resolved conflicts for merge of f0b81d23 to klp-dev

Change-Id: I8dbcf6f11bebb97d31c0a95c01c5a3238c1a7f63
tree: eb0a1d03df2f5ea35fb58bda1850515752634570
  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. rsCompatibilityLib.cpp
  21. rsCompatibilityLib.h
  22. rsComponent.cpp
  23. rsComponent.h
  24. rsContext.cpp
  25. rsContext.h
  26. rsCppUtils.cpp
  27. rsCppUtils.h
  28. rsDebugHelper.h
  29. rsDefines.h
  30. rsDevice.cpp
  31. rsDevice.h
  32. rsElement.cpp
  33. rsElement.h
  34. rsEnv.h
  35. rsFBOCache.cpp
  36. rsFBOCache.h
  37. rsFifo.h
  38. rsFifoSocket.cpp
  39. rsFifoSocket.h
  40. rsFileA3D.cpp
  41. rsFileA3D.h
  42. rsFont.cpp
  43. rsFont.h
  44. rsg.spec
  45. rsg_generator.c
  46. rsgApi.cpp.rsg
  47. rsgApiFuncDecl.h.rsg
  48. rsgApiReplay.cpp.rsg
  49. rsgApiStructs.h.rsg
  50. rsGrallocConsumer.cpp
  51. rsGrallocConsumer.h
  52. rsMatrix2x2.cpp
  53. rsMatrix2x2.h
  54. rsMatrix3x3.cpp
  55. rsMatrix3x3.h
  56. rsMatrix4x4.cpp
  57. rsMatrix4x4.h
  58. rsMesh.cpp
  59. rsMesh.h
  60. rsMutex.cpp
  61. rsMutex.h
  62. rsObjectBase.cpp
  63. rsObjectBase.h
  64. rsPath.cpp
  65. rsPath.h
  66. rsProgram.cpp
  67. rsProgram.h
  68. rsProgramBase.h
  69. rsProgramFragment.cpp
  70. rsProgramFragment.h
  71. rsProgramRaster.cpp
  72. rsProgramRaster.h
  73. rsProgramStore.cpp
  74. rsProgramStore.h
  75. rsProgramVertex.cpp
  76. rsProgramVertex.h
  77. rsRuntime.h
  78. rsSampler.cpp
  79. rsSampler.h
  80. rsScript.cpp
  81. rsScript.h
  82. rsScriptC.cpp
  83. rsScriptC.h
  84. rsScriptC_Lib.cpp
  85. rsScriptC_LibGL.cpp
  86. rsScriptGroup.cpp
  87. rsScriptGroup.h
  88. rsScriptIntrinsic.cpp
  89. rsScriptIntrinsic.h
  90. rsSignal.cpp
  91. rsSignal.h
  92. rsStream.cpp
  93. rsStream.h
  94. rsThreadIO.cpp
  95. rsThreadIO.h
  96. rsType.cpp
  97. rsType.h
  98. rsUtils.h
  99. spec.h
  100. spec.l