Commit 414aadc7 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 

* commit '3bf2fcf9':
  Revert "Update ion header"
  :Revert "Update ion header"
  Revert "Upgrade to dlmalloc 2.8.5."
  Revert "Restore posix_memalign"
  When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
  When compiling with clang, don't "fortify_source" the strlen.
  Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
  Update msm_camera.h to version that supports instance handle based lookup
  Replace ALL_PREBUILTS with BUILD_PREBUILT
parents bd8ee3d3 3bf2fcf9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment