OSDN Git Service

am 839d11d1: Merge changes I0a744dc7,Id993a70d
authorMark Salyzyn <salyzyn@google.com>
Tue, 15 Apr 2014 22:35:00 +0000 (22:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Apr 2014 22:35:00 +0000 (22:35 +0000)
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
  media: use size_t for integer iterator to Vector::size()
  media: 64 bit compile issues

1  2 
media/libstagefright/OMXCodec.cpp
media/libstagefright/omx/GraphicBufferSource.cpp
services/audioflinger/Tracks.cpp

Simple merge
Simple merge