tree d3ab7b42eae95f1b0ea7b186adf4a1def484babf
parent 8c5dd0061d6c2ee2223b6aa83e1f4ad1b7cb1e3f
parent c4bb45511c00e21cdb789625aba058f30eb7f1ac
author Deckard Autoverifier <deckard@android.com> 1311028884 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311028884 -0700

am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '68e37dacc065eebb971d443722b7a8413ff403d6':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers