OSDN Git Service

am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 21 May 2012 22:18:13 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 22:18:13 +0000 (15:18 -0700)
commita48e7ff33231a354f6da5aff04d4b609a6fabe2b
treebbc8bba4ff462cbb2c9f65b91dfe18e331a24b5d
parentf7b8bbadf50f313733dd89c5680f0ffc60f364bc
parent7bce428ccc41210d9271b32f1ea94af0ef6bff7d
am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"

* commit '7bce428ccc41210d9271b32f1ea94af0ef6bff7d':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting