| commit | 61d3cf3bfa5dd17bd036ef6a536f40aa5467e923 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 18 16:52:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 18 16:52:26 2011 -0700 |
| tree | a44e8431ff02b04504c2f04bb41712b3d0ba55e1 | |
| parent | 07f2ce413abdc7fcee685396a085b0fa338ea459 [diff] | |
| parent | 0d0cbd3d03ad6c9001bfee08911ec3c18ac996f5 [diff] |
am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" * commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3': stagefright aacenc: Mark codeWord as UWord16