Google Git
Sign in
ara-mdk / platform / frameworks / rs / 8f96500365ad133aeb7cdbd2291dab943770b98d
commit8f96500365ad133aeb7cdbd2291dab943770b98d[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Mon Mar 11 13:44:37 2013 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Mar 11 13:44:37 2013 -0700
treea90c59b83250bf4c1aa18227c790337aadad79e8
parentcadfac411e6690e39de36c4f9e94deb9b7d2d08e [diff]
parent2116d2c4ed655a2c1f75b4a01af46c999db3655a [diff]
am 2116d2c4: am 8a12a658: am c792bc27: (-s ours) am 97d35e81: (-s ours) Reconcile with jb-mr1-release - do not merge

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