Commit 61d3cf3b authored by Conley Owens's avatar Conley Owens Committed by Android Git Automerger
Browse files

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

* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
parents 07f2ce41 0d0cbd3d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment