tree 62a3555429c3caf6d6220df764adf91a9ee9b991
parent 5ce26add5b9016a62f8f5304157b2e977da8e0b1
parent 1a2e0482214e9b79a849a5ff455d67b8a8b40bae
author Deckard Autoverifier <deckard@android.com> 1311029034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311029034 -0700

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

* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers