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

* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  stagefright aacenc: Mark codeWord as UWord16
This commit is contained in:
Conley Owens 2011-07-18 16:57:04 -07:00 committed by Android Git Automerger
commit 4dac1c4e10

Diff Content Not Available