tree f29e999516711c5a53e8b2f9f88f5f5580c033d1
parent 50220376d56efea3187c6ee3d47b2380c6ad66c6
parent b72d0474ab2a0d78b2fb61973920aba9d777094c
author Jean-Baptiste Queru <jbq@google.com> 1346173581 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346173581 -0700

am b72d0474: Merge "Use gcc 4.6"

* commit 'b72d0474ab2a0d78b2fb61973920aba9d777094c':
  Use gcc 4.6