Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 095623bbf9d7b85d182944bb7b0f6430a30bbae0
commit095623bbf9d7b85d182944bb7b0f6430a30bbae0[log] [tgz]
authorThe Android Open Source Project <initial-contribution@android.com>Fri Jun 14 12:37:53 2013 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Fri Jun 14 12:37:53 2013 -0700
tree4ed8315d834e80e0a232d98201893099c25a321f
parentd89c234c749386a4dc6e362e719cb230853f18e4 [diff]
parentf85f4a21f9a5691f6248b41237031325465c5895 [diff]
am f85f4a21: (-s ours) Reconcile with jb-mr2-release - do not merge

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