tree 307dc4318ff1e66447deddf46b1dd64a647882d2
parent 18536b6cb0c5e4f316b98ba471d138cb45b490b7
parent 0c328eae6ea431cc7014502403830ae2b5bc1210
author Jean-Baptiste Queru <jbq@google.com> 1335303095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335303095 -0700

am 0c328eae: Merge "Point to gcc 4.6"

* commit '0c328eae6ea431cc7014502403830ae2b5bc1210':
  Point to gcc 4.6