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

* commit '3bf2fcf9a2bc811bbee194b19f2a00c4cfb24701':
  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
This commit is contained in:
The Android Open Source Project 2012-11-06 11:13:52 -08:00 committed by Android Git Automerger
commit 414aadc79d

Diff content is not available