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)
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16


Trivial merge