tree fb51acc947c87b30b90f69204cff24c064785dc3
parent 6dfbf0240b77acaf7d6b650b4c206deb29337e7b
parent bf3d3287acad729c5db51df24ba443ea0d94c9aa
author Jean-Baptiste Queru <jbq@google.com> 1336424179 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336424179 -0700

am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"

* commit 'bf3d3287acad729c5db51df24ba443ea0d94c9aa':
  Use the same compilation flags on OS X 10.8 as 10.7