Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / compile / slang / aa0539ee8696b3d373029f6b93581d827def0089
commitaa0539ee8696b3d373029f6b93581d827def0089[log] [tgz]
authorStephen Hines <srhines@google.com>Thu Aug 27 10:50:13 2015 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>Thu Aug 27 10:50:13 2015 +0000
treeebd4d739215332e242fa5cba88f95c0791873d42
parent6b2416cc1b3d09de3f386a49b949459c2157e0d7 [diff]
parent06f713280f7b8780e936dce562e5584172cfad5c [diff]
am 06f71328: (-s ours) resolved conflicts for merge of b3e022a6 to mnc-dev-plus-aosp

* commit '06f713280f7b8780e936dce562e5584172cfad5c':
tree: ebd4d739215332e242fa5cba88f95c0791873d42
  1. BitWriter_2_9/
  2. BitWriter_2_9_func/
  3. BitWriter_3_2/
  4. lit-tests/
  5. tests/
  6. .clang-format
  7. Android.mk
  8. legacy_bitcode.h
  9. llvm-rs-as.cpp
  10. llvm-rs-cc.cpp
  11. MODULE_LICENSE_APACHE2
  12. NOTICE
  13. os_sep.h
  14. README.html
  15. README.rst
  16. rs_cc_options.cpp
  17. rs_cc_options.h
  18. rs_version.mk
  19. RSCCOptions.td
  20. slang.cpp
  21. slang.h
  22. slang_assert.h
  23. slang_backend.cpp
  24. slang_backend.h
  25. slang_bitcode_gen.cpp
  26. slang_bitcode_gen.h
  27. slang_diagnostic_buffer.cpp
  28. slang_diagnostic_buffer.h
  29. slang_pragma_recorder.cpp
  30. slang_pragma_recorder.h
  31. slang_rs_ast_replace.cpp
  32. slang_rs_ast_replace.h
  33. slang_rs_check_ast.cpp
  34. slang_rs_check_ast.h
  35. slang_rs_context.cpp
  36. slang_rs_context.h
  37. slang_rs_export_element.cpp
  38. slang_rs_export_element.h
  39. slang_rs_export_foreach.cpp
  40. slang_rs_export_foreach.h
  41. slang_rs_export_func.cpp
  42. slang_rs_export_func.h
  43. slang_rs_export_reduce.cpp
  44. slang_rs_export_reduce.h
  45. slang_rs_export_type.cpp
  46. slang_rs_export_type.h
  47. slang_rs_export_var.cpp
  48. slang_rs_export_var.h
  49. slang_rs_exportable.cpp
  50. slang_rs_exportable.h
  51. slang_rs_metadata.h
  52. slang_rs_object_ref_count.cpp
  53. slang_rs_object_ref_count.h
  54. slang_rs_pragma_handler.cpp
  55. slang_rs_pragma_handler.h
  56. slang_rs_reflect_utils.cpp
  57. slang_rs_reflect_utils.h
  58. slang_rs_reflection.cpp
  59. slang_rs_reflection.h
  60. slang_rs_reflection_cpp.cpp
  61. slang_rs_reflection_cpp.h
  62. slang_rs_special_func.cpp
  63. slang_rs_special_func.h
  64. slang_version.h
  65. strip_unknown_attributes.cpp
  66. strip_unknown_attributes.h