am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
This commit is contained in:
Conley Owens 2011-07-18 16:52:26 -07:00 committed by Android Git Automerger
commit 61d3cf3bfa

Diff Content Not Available