OSDN Git Service

am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as...
authorConley Owens <cco3@android.com>
Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)
commit83937f38f0ea0d22b3a8ac61960fe87eb419f6c9
tree62a3555429c3caf6d6220df764adf91a9ee9b991
parentc2c84e91b2e6cf354c1154b227ff5679b35c7401
parent60f8195edcf75969041bcbebdf5ed54ea76f9ec2
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16