Google Git
Sign in
ara-mdk / platform / frameworks / rs / c792bc2780fdbe11d785e53c37c1d21bda8a4bc0
commitc792bc2780fdbe11d785e53c37c1d21bda8a4bc0[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Mon Mar 11 12:23:10 2013 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Mar 11 12:23:10 2013 -0700
tree89b7af6b53936b9a9369fd0c4279ca51d3db5e66
parent36f07d854de88949d632f77bffab322ffa826bcc [diff]
parent97d35e81f1a2a9469be3fa82c78666058b4f7800 [diff]
am 97d35e81: (-s ours) Reconcile with jb-mr1-release - do not merge

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