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

* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
This commit is contained in:
Conley Owens 2011-07-18 16:55:33 -07:00 committed by Android Git Automerger
commit 83937f38f0

Diff Content Not Available