OSDN Git Service

am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
authorConley Owens <cco3@android.com>
Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16


Trivial merge