tree f7a109914949344c5bf70c0589fe02fc7c949240
parent 559ffeb2efd1a3713b715fe0590827054a3b1656
parent b031afab543d8bf9bb236ff4c297f5ced70f8943
author Jean-Baptiste Queru <jbq@google.com> 1336424396 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336424396 -0700

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

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