tree f29e999516711c5a53e8b2f9f88f5f5580c033d1
parent e019c1a0d289d520b7b7433772a2d18549bcecc4
parent 3faf4c4879c9ec35d464774444b75a2e6b4224a6
author Jean-Baptiste Queru <jbq@google.com> 1346184120 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346184120 -0700

am 3faf4c48: am b72d0474: Merge "Use gcc 4.6"

* commit '3faf4c4879c9ec35d464774444b75a2e6b4224a6':
  Use gcc 4.6