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

* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16
This commit is contained in:
Conley Owens 2011-07-18 16:53:41 -07:00 committed by Android Git Automerger
commit 60f8195edc

Diff Content Not Available